diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index aa1b710ef..65aa2734e 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -159,7 +159,7 @@ public enum ErrorCodeEnum { OPEN_AREA_IS_NOT_EXISTS(107006, "意向区域城市不存在", null), REGION_NOT_EXIST(108001, "区域不存在",null), - ONLY_WAR_REGION_CONFIG(108002, "意向省市只能配置到战区",null), + ONLY_WAR_REGION_CONFIG(108002, "意向省市只能配置到大区",null), NOT_APPROVE_NODE(109001, "不是审批节点",null), diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 84834535c..bf65ab919 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -30,6 +30,7 @@ + INSERT INTO xfsg_line_info @@ -43,6 +44,9 @@ region_id, + + big_region_id, + mobile, @@ -129,6 +133,9 @@ #{param.regionId}, + + #{param.bigRegionId}, + #{param.mobile}, @@ -213,6 +220,9 @@ region_id = #{param.regionId}, + + big_region_id = #{param.bigRegionId}, + mobile = #{param.mobile}, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java index e27d5a4a3..4be2b2613 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java @@ -21,6 +21,9 @@ public class LineInfoDO { @Column(name = "region_id") private Long regionId; + @Column(name = "big_region_id") + private Long bigRegionId; + /** * 手机号 */ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java index 0fa951060..a35581d59 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java @@ -18,4 +18,6 @@ public class AddLineRequest { private String investmentManagerUserId; + private Long warRegionId; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 23301a940..ccd2ac794 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -80,7 +80,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt lineInfoParam.setLineStatus(1); if (lineInfoParam.getWantShopAreaId() != null) { Long regionId = regionAreaConfigDao.getByWantShopAreaId(lineInfoParam.getWantShopAreaId()); - lineInfoParam.setRegionId(regionId); + lineInfoParam.setBigRegionId(regionId); } lineInfoDAO.insertOrUpdate(lineInfoParam); MemberQuestionDO memberQuestionDO = request.toMemberQuestionDO(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index e814a64d1..cb899f181 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -417,7 +417,8 @@ public class LineServiceImpl implements LineService { userId = user.getUserId(); } Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId()); - lineInfoDO.setRegionId(regionId); + lineInfoDO.setBigRegionId(regionId); + lineInfoDO.setRegionId(addLineRequest.getWarRegionId()); lineInfoDO.setInvestmentManager(userId); lineInfoDO.setCreateUserId(userId); lineInfoDO.setUpdateUserId(userId);