Skip to content

G
gic-store
Commit 90a8c4f9 by 陶光胜
Options

门店域关联

parent ebd6d85d
Showing with 110 additions and 13 deletions
gic-store-api/src/main/java/com/gic/store/dto/StoreRegionDTO.java
......@@ -26,6 +26,11 @@ public class StoreRegionDTO implements Serializable {
private String regionName;
/**
* 是否关联erp 1是 0否
*/
private Integer erpFlag;
/**
* 状态值；1有效 0无效
*/
private Integer deleteFlag;
......@@ -130,6 +135,14 @@ public class StoreRegionDTO implements Serializable {
return shareEnterpriseName;
}
public Integer getErpFlag() {
return erpFlag;
}
public void setErpFlag(Integer erpFlag) {
this.erpFlag = erpFlag;
}
@Override
public String toString() {
return "StoreRegionDTO{" +
......
gic-store-api/src/main/java/com/gic/store/service/StoreRegionApiService.java
......@@ -137,4 +137,16 @@ public interface StoreRegionApiService {
* @throws
*/
ServiceResponse<StoreRegionDTO> getStoreRegionByRegionName(Integer enterpriseId, String regionName);
/**
* 门店域和erp关联接口
* @Title: 门店域和erp关联接口
* @Description:
* @author taogs
* @param enterpriseId
* @param storeRegionId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<String> relationErp(Integer enterpriseId, Integer storeRegionId);
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreRegionMapper.java
......@@ -43,7 +43,7 @@ public interface TabStoreRegionMapper {
* @param regionId 主键
* @return 实体对象
*/
TabStoreRegion selectByPrimaryKey(@Param("enterpriseId") Integer enterpriseId, @Param("regionId") Integer regionId);
StoreRegionDTO selectByPrimaryKey(@Param("enterpriseId") Integer enterpriseId, @Param("regionId") Integer regionId);
/**
* 根据主键动态更新记录
......@@ -105,4 +105,6 @@ public interface TabStoreRegionMapper {
* @throws
*/
StoreRegionDTO getStoreRegionByRegionName(@Param("enterpriseId") Integer enterpriseId, @Param("regionName") String regionName);
int relationErp(@Param("enterpriseId") Integer enterpriseId, @Param("regionId") Integer regionId);
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/entity/TabStoreRegion.java
......@@ -29,6 +29,10 @@ public class TabStoreRegion {
private String regionName;
/**
* 是否关联erp 1是 0否
*/
private Integer erpFlag;
/**
* 状态值；1有效 0无效
*/
private Integer deleteFlag;
......@@ -90,4 +94,12 @@ public class TabStoreRegion {
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getErpFlag() {
return erpFlag;
}
public void setErpFlag(Integer erpFlag) {
this.erpFlag = erpFlag;
}
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/service/StoreRegionService.java
......@@ -110,7 +110,7 @@ public interface StoreRegionService {
* @return com.gic.store.entity.TabStoreRegion
* @throws
*/
TabStoreRegion getById(Integer enterpriseId, Integer regionId);
StoreRegionDTO getById(Integer enterpriseId, Integer regionId);
/**
* listStoreRegionByIds
......@@ -148,4 +148,16 @@ public interface StoreRegionService {
* @throws
*/
StoreRegionDTO getStoreRegionByRegionName(Integer enterpriseId, String regionName);
/**
* 门店域和erp关联
* @Title: 门店域和erp关联
* @Description:
* @author taogs
* @param enterpriseId
* @param regionId
* @return void
* @throws
*/
String relationErp(Integer enterpriseId, Integer regionId);
}
gic-store-service/src/main/java/com/gic/store/service/impl/StoreRegionServiceImpl.java
package com.gic.store.service.impl;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.dao.mapper.TabStoreRegionMapper;
import com.gic.store.dto.StoreRegionDTO;
import com.gic.store.entity.TabStoreRegion;
......@@ -83,7 +84,7 @@ public class StoreRegionServiceImpl implements StoreRegionService {
}
@Override
public TabStoreRegion getById(Integer enterpriseId, Integer regionId) {
public StoreRegionDTO getById(Integer enterpriseId, Integer regionId) {
return storeRegionMapper.selectByPrimaryKey(enterpriseId, regionId);
}
......@@ -101,4 +102,17 @@ public class StoreRegionServiceImpl implements StoreRegionService {
public StoreRegionDTO getStoreRegionByRegionName(Integer enterpriseId, String regionName) {
return storeRegionMapper.getStoreRegionByRegionName(enterpriseId, regionName);
}
@Override
public String relationErp(Integer enterpriseId, Integer regionId) {
StoreRegionDTO storeRegionDTO = this.getById(enterpriseId, regionId);
if(storeRegionDTO.getOwnType() == StoreOwnTypeEnum.OTHER.getCode()){
return "共享域无法关联";
}
int i = this.storeRegionMapper.relationErp(enterpriseId, regionId);
if(i == 0){
return "关联失败";
}
return null;
}
}
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
......@@ -598,7 +598,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
if (regionId == null) {
return responseErrorElement(ImportClerkBatchResultEnum.A1);
}
TabStoreRegion tabStoreRegion = storeRegionService.getById(enterpriseId, regionId);
StoreRegionDTO tabStoreRegion = storeRegionService.getById(enterpriseId, regionId);
if (tabStoreRegion == null) {
return responseErrorElement(ImportClerkBatchResultEnum.A2);
}
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
......@@ -262,7 +262,7 @@ public class StoreApiServiceImpl implements StoreApiService {
if (nameValid) {
return ServiceResponse.failure(ErrorCode.DATA_EXISTS.getCode(), "门店名称已经存在");
}
TabStoreRegion region = storeRegionService.getById(storeDTO.getEnterpriseId(), storeDTO.getRegionId());
StoreRegionDTO region = storeRegionService.getById(storeDTO.getEnterpriseId(), storeDTO.getRegionId());
if (region == null) {
return ServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), "门店域不存在");
}
......@@ -940,7 +940,7 @@ public class StoreApiServiceImpl implements StoreApiService {
if (processBatchStoreDTO.getRegionId() == null) {
return responseErrorElement(ImportStoreBatchResultEnum.A1);
}
TabStoreRegion storeRegion = storeRegionService.getById(processBatchStoreDTO.getEnterpriseId(), processBatchStoreDTO.getRegionId());
StoreRegionDTO storeRegion = storeRegionService.getById(processBatchStoreDTO.getEnterpriseId(), processBatchStoreDTO.getRegionId());
if (storeRegion == null) {
return responseErrorElement(ImportStoreBatchResultEnum.A2);
}
......@@ -1254,7 +1254,7 @@ public class StoreApiServiceImpl implements StoreApiService {
if (store == null) {
return null;
}
TabStoreRegion tabStoreRegion = this.storeRegionService.getById(enterpriseId, store.getRegionId());
StoreRegionDTO tabStoreRegion = this.storeRegionService.getById(enterpriseId, store.getRegionId());
if (tabStoreRegion == null) {
return null;
}
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreOpenApiServiceImpl.java
......@@ -669,7 +669,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
if (!enterpriseResult.isSuccess()) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID错误，无此商户");
}
TabStoreRegion region = storeRegionService.getById(enterpriseId, regionId);
StoreRegionDTO region = storeRegionService.getById(enterpriseId, regionId);
if (region == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店域不存在");
}
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreRegionApiServiceImpl.java
......@@ -19,6 +19,7 @@ import com.gic.store.service.StoreRegionApiService;
import com.gic.store.service.StoreRegionRelService;
import com.gic.store.service.StoreRegionService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -180,4 +181,13 @@ public class StoreRegionApiServiceImpl implements StoreRegionApiService {
return EnterpriseServiceResponse.success(regionDTO);
}
@Override
public ServiceResponse<String> relationErp(Integer enterpriseId, Integer storeRegionId) {
String result = this.storeRegionService.relationErp(enterpriseId, storeRegionId);
if(StringUtils.isNotBlank(result)){
return ServiceResponse.failure(ErrorCode.SYSTEM_ERROR.getCode(), result);
}
return ServiceResponse.success();
}
}
gic-store-service/src/main/resources/mapper/TabStoreRegionMapper.xml
......@@ -6,6 +6,7 @@
<result column="region_code" jdbcType="VARCHAR" property="regionCode" />
<result column="region_name" jdbcType="VARCHAR" property="regionName" />
<result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
<result column="erp_flag" jdbcType="INTEGER" property="erpFlag" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
......@@ -14,6 +15,7 @@
<result column="region_code" jdbcType="VARCHAR" property="regionCode" />
<result column="region_name" jdbcType="VARCHAR" property="regionName" />
<result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
<result column="erp_flag" jdbcType="INTEGER" property="erpFlag" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
......@@ -21,15 +23,15 @@
<result column="own_type" jdbcType="INTEGER" property="ownType" />
</resultMap>
<sql id="Base_Column_List">
region_id, region_code, region_name, delete_flag, create_time, update_time
region_id, region_code, region_name, delete_flag, erp_flag, create_time, update_time
</sql>
<sql id="Base_Column_List1">
${alias}.region_id, ${alias}.region_code, ${alias}.region_name, ${alias}.delete_flag, ${alias}.create_time, ${alias}.update_time
${alias}.region_id, ${alias}.region_code, ${alias}.region_name, ${alias}.delete_flag, ${alias}.erp_flag, ${alias}.create_time, ${alias}.update_time
</sql>
<sql id="Base_Column_List2">
${alias}.enterprise_id,${alias}.from_enterprise_id, ${alias}.own_Type
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="DTOResultMap">
select
<include refid="Base_Column_List1" >
<property name="alias" value="re" />
......@@ -50,10 +52,10 @@
</delete>
<insert id="insert" parameterType="com.gic.store.entity.TabStoreRegion">
insert into tab_store_region (region_id, region_code, region_name,
delete_flag, create_time, update_time
delete_flag,erp_flag, create_time, update_time
)
values (#{regionId,jdbcType=INTEGER}, #{regionCode,jdbcType=VARCHAR}, #{regionName,jdbcType=VARCHAR},
#{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
#{deleteFlag,jdbcType=INTEGER},#{erpFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreRegion">
......@@ -74,6 +76,9 @@
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="erpFlag != null">
erp_flag,
</if>
<if test="createTime != null">
create_time,
</if>
......@@ -94,6 +99,9 @@
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=INTEGER},
</if>
<if test="erpFlag != null">
#{erpFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
......@@ -114,6 +122,9 @@
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=INTEGER},
</if>
<if test="erpFlag != null">
erp_flag = #{erpFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
......@@ -128,6 +139,7 @@
set region_code = #{regionCode,jdbcType=VARCHAR},
region_name = #{regionName,jdbcType=VARCHAR},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
erp_flag = #{erpFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where region_id = #{regionId,jdbcType=INTEGER}
......@@ -211,4 +223,10 @@
and re.region_name = #{regionName}
limit 1
</select>
<update id="relationErp" parameterType="com.gic.store.entity.TabStoreRegion">
update tab_store_region
set
erp_flag = 1
where region_id = #{regionId,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment