Skip to content

G
gic-store
Commit 81c1ae1a by zhiwj
Options

Revert "去掉门店域code" 

This reverts commit f789d218
parent 6534ad67
Showing with 81 additions and 12 deletions
gic-store-api/src/main/java/com/gic/store/dto/StoreRegionDTO.java
......@@ -16,6 +16,11 @@ public class StoreRegionDTO implements Serializable {
private Integer regionId;
/**
* 域code
*/
private String regionCode;
/**
*
*/
private String regionName;
......@@ -53,6 +58,14 @@ public class StoreRegionDTO implements Serializable {
this.regionId = regionId;
}
public String getRegionCode() {
return regionCode;
}
public void setRegionCode(String regionCode) {
this.regionCode = regionCode;
}
public String getRegionName() {
return regionName;
}
......
gic-store-api/src/main/java/com/gic/store/service/StoreRegionApiService.java
......@@ -19,12 +19,13 @@ public interface StoreRegionApiService {
* @Description: 保存门店域
* @author zhiwj
* @param enterpriseId
* @param regionCode
* @param regionName
* @param regionId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
* @throws
*/
ServiceResponse<Integer> saveOrUpdateStoreRegion(Integer enterpriseId, String regionName, Integer regionId);
ServiceResponse<Integer> saveOrUpdateStoreRegion(Integer enterpriseId, String regionCode, String regionName, Integer regionId);
/**
* @Title: listStoreRegion
......
gic-store-service/src/main/java/com/gic/store/entity/TabStoreRegion.java
......@@ -12,6 +12,11 @@ public class TabStoreRegion {
private Integer regionId;
/**
* 域code
*/
private String regionCode;
/**
*
*/
private String regionName;
......@@ -39,6 +44,14 @@ public class TabStoreRegion {
this.regionId = regionId;
}
public String getRegionCode() {
return regionCode;
}
public void setRegionCode(String regionCode) {
this.regionCode = regionCode;
}
public String getRegionName() {
return regionName;
}
......
gic-store-service/src/main/java/com/gic/store/service/StoreRegionService.java
......@@ -12,9 +12,11 @@ import java.util.List;
*/
public interface StoreRegionService {
int countByRegionCode(Integer enterpriseId, String regionCode);
int countByRegionName(Integer enterpriseId, String regionName, Integer regionId);
Integer save(Integer enterpriseId, String regionName);
Integer save(Integer enterpriseId, String regionCode, String regionName);
int update(Integer regionId, String regionName);
......
gic-store-service/src/main/java/com/gic/store/service/impl/StoreRegionServiceImpl.java
......@@ -28,6 +28,14 @@ public class StoreRegionServiceImpl implements StoreRegionService {
private TabStoreRegionMapper storeRegionMapper;
@Override
public int countByRegionCode(Integer enterpriseId, String regionCode) {
StoreRegionDTO storeRegion = new StoreRegionDTO();
storeRegion.setEnterpriseId(enterpriseId);
storeRegion.setRegionCode(regionCode);
return storeRegionMapper.countBySelective(storeRegion);
}
@Override
public int countByRegionName(Integer enterpriseId, String regionName, Integer regionId) {
StoreRegionDTO storeRegion = new StoreRegionDTO();
storeRegion.setEnterpriseId(enterpriseId);
......@@ -37,8 +45,9 @@ public class StoreRegionServiceImpl implements StoreRegionService {
}
@Override
public Integer save(Integer enterpriseId, String regionName) {
public Integer save(Integer enterpriseId, String regionCode, String regionName) {
TabStoreRegion storeRegion = new TabStoreRegion();
storeRegion.setRegionCode(regionCode);
storeRegion.setRegionName(regionName);
storeRegion.setCreateTime(new Date());
// storeRegion.setEnterpriseId(enterpriseId);
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreRegionApiServiceImpl.java
......@@ -44,16 +44,21 @@ public class StoreRegionApiServiceImpl implements StoreRegionApiService {
@Override
@Transactional(rollbackFor = Exception.class)
public ServiceResponse<Integer> saveOrUpdateStoreRegion(Integer enterpriseId, String regionName, Integer regionId) {
public ServiceResponse<Integer> saveOrUpdateStoreRegion(Integer enterpriseId, String regionCode, String regionName, Integer regionId) {
StoreRegionDTO storeRegionDTO = new StoreRegionDTO();
storeRegionDTO.setRegionName(regionName);
storeRegionDTO.setRegionCode(regionCode);
if (regionId == null) {
// 新增
int codeCount = storeRegionService.countByRegionCode(enterpriseId, regionCode);
if (codeCount > 0) {
return ServiceResponse.failure(ErrorCode.DATA_EXISTS.getCode(), "域code已存在");
}
int nameCount = storeRegionService.countByRegionName(enterpriseId, regionName, null);
if (nameCount > 0) {
return ServiceResponse.failure(ErrorCode.DATA_EXISTS.getCode(), "域名称已存在");
}
regionId = storeRegionService.save(enterpriseId, regionName);
regionId = storeRegionService.save(enterpriseId, regionCode, regionName);
storeRegionRelService.saveByOwner(enterpriseId, regionId);
// LogUtils.saveAddLog(storeRegionDTO);
}else {
......
gic-store-service/src/main/java/com/gic/store/utils/PropertyNameMap.java
......@@ -16,6 +16,7 @@ public class PropertyNameMap {
static {
map.put("regionName", "门店域名称");
map.put("regionCode", "门店域code");
map.put("storeBrandCode", "品牌code");
map.put("storeBrandName", "品牌名称");
map.put("storeBrandCategory", "经营类目");
......
gic-store-service/src/main/resources/mapper/TabStoreRegionMapper.xml
......@@ -3,6 +3,7 @@
<mapper namespace="com.gic.store.dao.mapper.TabStoreRegionMapper">
<resultMap id="BaseResultMap" type="com.gic.store.entity.TabStoreRegion">
<id column="region_id" jdbcType="INTEGER" property="regionId" />
<result column="region_code" jdbcType="VARCHAR" property="regionCode" />
<result column="region_name" jdbcType="VARCHAR" property="regionName" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
......@@ -10,6 +11,7 @@
</resultMap>
<resultMap id="DTOResultMap" type="com.gic.store.dto.StoreRegionDTO">
<id column="region_id" jdbcType="INTEGER" property="regionId" />
<result column="region_code" jdbcType="VARCHAR" property="regionCode" />
<result column="region_name" jdbcType="VARCHAR" property="regionName" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
......@@ -19,10 +21,10 @@
<result column="own_type" jdbcType="INTEGER" property="ownType" />
</resultMap>
<sql id="Base_Column_List">
region_id, region_name, status, create_time, update_time
region_id, region_code, region_name, status, create_time, update_time
</sql>
<sql id="Base_Column_List1">
${alias}.region_id, ${alias}.region_name, ${alias}.status, ${alias}.create_time, ${alias}.update_time
${alias}.region_id, ${alias}.region_code, ${alias}.region_name, ${alias}.status, ${alias}.create_time, ${alias}.update_time
</sql>
<sql id="Base_Column_List2">
${alias}.enterprise_id,${alias}.from_enterprise_id, ${alias}.own_Type
......@@ -47,10 +49,10 @@
where region_id = #{regionId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.store.entity.TabStoreRegion">
insert into tab_store_region (region_id, region_name,
insert into tab_store_region (region_id, region_code, region_name,
status, create_time, update_time
)
values (#{regionId,jdbcType=INTEGER}, #{regionName,jdbcType=VARCHAR},
values (#{regionId,jdbcType=INTEGER}, #{regionCode,jdbcType=VARCHAR}, #{regionName,jdbcType=VARCHAR},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
......@@ -63,6 +65,9 @@
<if test="regionId != null">
region_id,
</if>
<if test="regionCode != null">
region_code,
</if>
<if test="regionName != null">
region_name,
</if>
......@@ -80,6 +85,9 @@
<if test="regionId != null">
#{regionId,jdbcType=INTEGER},
</if>
<if test="regionCode != null">
#{regionCode,jdbcType=VARCHAR},
</if>
<if test="regionName != null">
#{regionName,jdbcType=VARCHAR},
</if>
......@@ -97,6 +105,9 @@
<update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabStoreRegion">
update tab_store_region
<set>
<if test="regionCode != null">
region_code = #{regionCode,jdbcType=VARCHAR},
</if>
<if test="regionName != null">
region_name = #{regionName,jdbcType=VARCHAR},
</if>
......@@ -114,7 +125,8 @@
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.store.entity.TabStoreRegion">
update tab_store_region
set region_name = #{regionName,jdbcType=VARCHAR},
set region_code = #{regionCode,jdbcType=VARCHAR},
region_name = #{regionName,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
......@@ -134,7 +146,7 @@
and rr.`status` = 1
and rr.enterprise_id = #{enterpriseId}
<if test="search != null and search != '' ">
and re.region_name like concat('%', #{search}, '%')
and ( re.region_code like concat('%', #{search}, '%') or re.region_name like concat('%', #{search}, '%') )
</if>
<if test="ownType != null ">
and rr.own_type = #{ownType}
......@@ -148,6 +160,9 @@
where re.region_id = rr.region_id
and rr.`status` = 1
and rr.enterprise_id = #{enterpriseId}
<if test="regionCode != null and regionCode != '' ">
and re.region_code = #{regionCode}
</if>
<if test="regionName != null and regionName != '' ">
and re.region_name = #{regionName}
</if>
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreRegionController.java
......@@ -30,7 +30,7 @@ public class StoreRegionController {
@RequestMapping("/save-store-region")
public RestResponse saveStoreRegion(@Validated({StoreRegionQO.SaveValidView.class}) StoreRegionQO storeRegionQO) {
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
ServiceResponse<Integer> serviceResponse = storeRegionApiService.saveOrUpdateStoreRegion(enterpriseId, storeRegionQO.getRegionName(), storeRegionQO.getRegionId());
ServiceResponse<Integer> serviceResponse = storeRegionApiService.saveOrUpdateStoreRegion(enterpriseId, storeRegionQO.getRegionCode(), storeRegionQO.getRegionName(), storeRegionQO.getRegionId());
if (serviceResponse.isSuccess()) {
LogUtils.createLog((storeRegionQO.getRegionId() == null ? "新增" : "修改") + "门店域", storeRegionQO.getRegionName());
return RestResponse.success(serviceResponse.getResult());
......
gic-store-web/src/main/java/com/gic/store/web/qo/region/StoreRegionQO.java
......@@ -14,6 +14,8 @@ public class StoreRegionQO implements Serializable {
public interface SaveValidView{}
private Integer regionId;
@NotNull(message = "门店域code不能为空", groups = {SaveValidView.class})
private String regionCode;
@NotNull(message = "门店域名称不能为空", groups = {SaveValidView.class})
private String regionName;
......@@ -25,6 +27,14 @@ public class StoreRegionQO implements Serializable {
this.regionId = regionId;
}
public String getRegionCode() {
return regionCode;
}
public void setRegionCode(String regionCode) {
this.regionCode = regionCode;
}
public String getRegionName() {
return regionName;
}
......
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