diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index 4dbb56518..4a7ea9225 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -84,6 +84,7 @@ public enum MessageEnum { MESSAGE_56("您有一个门店测量阶段待提交，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_57("您有一个门店测量阶段待分配测量员和设计组，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_58("您有一个门店设计阶段待分配设计师，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_59("您有一个门店设计阶段报价任务待领取，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), ; private String title; diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 8ccec1f70..0ab2c291d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -295,7 +295,13 @@ a.shop_status as shopStatus, a.detail_address as shopAddress from xfsg_shop_info a left join xfsg_line_info b on a.line_id = b.id + + left join xfsg_sign_franchise c on a.id = c.shop_id + where a.deleted = 0 + + and c.create_time between #{request.contractStartTime} and #{request.contractEndTime} + and (b.username like concat('%', #{request.partnerKeyword}, '%') or b.mobile like concat('%', #{request.partnerKeyword}, '%')) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index 6d692b49c..97b5d7b45 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -285,6 +285,7 @@ #{regionId} + order by a.update_time desc diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java index b6b06b74b..5dc3a05b3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java @@ -49,4 +49,9 @@ public class PreparationDTO { private Integer joinMode; + private Integer storeType; + + private Long pointId; + + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java index 4c121e169..6f4d1d715 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java @@ -45,4 +45,8 @@ public class BranchShopRequest extends PageBasicInfo{ @NotNull private Integer flag; + @ApiModelProperty("合同开始时间") + private Date contractStartTime; + @ApiModelProperty("合同结束时间") + private Date contractEndTime; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index f44136ddf..ff612bda0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -91,6 +91,9 @@ public class DecorationServiceImpl implements DecorationService { @Resource DecorationMeasureDAO decorationMeasureDAO; + @Resource + EnterpriseUserRoleDao enterpriseUserRoleDao; + @Override public DesignInfoVo DesignInfo(Long shopId) { return null; @@ -560,6 +563,16 @@ public class DecorationServiceImpl implements DecorationService { } if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_902); + List quotationOfficeList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.QUOTATION_OFFICE.getCode())); + HashMap map = new HashMap<>(4); + map.put("partnerUsername", lineInfo.getUsername()); + map.put("partnerMobile", lineInfo.getMobile()); + map.put("storeName", shopInfo.getShopName()); + commonService.sendQWMessage( + quotationOfficeList, + MessageEnum.MESSAGE_59, + map + ); return Boolean.TRUE; } if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_902.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 7701df97c..2bad0a572 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -291,7 +291,7 @@ public class ShopServiceImpl implements ShopService { if (Objects.isNull(shopInfo)) { throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); } - shopInfo.setShopCode(request.getShopCode()); + shopInfo.setShopCode(request.getShopCode().trim()); shopInfo.setShopName(request.getShopName()); shopInfo.setUpdateTime(new Date()); shopInfo.setUpdateUserId(userId); @@ -405,7 +405,7 @@ public class ShopServiceImpl implements ShopService { ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); shopInfo.setUpdateUserId(userId); shopInfo.setUpdateTime(new Date()); - shopInfo.setShopCode(request.getShopCode()); + shopInfo.setShopCode(request.getShopCode().trim()); shopInfo.setShopName(request.getShopName()); shopInfo.setWantShopAreaId(request.getWantShopAreaId()); shopInfo.setRegionId(request.getRegionId()); @@ -506,7 +506,9 @@ public class ShopServiceImpl implements ShopService { for (PreparationDTO dto : preparations) { BranchShopResponse response = new BranchShopResponse(); response.setShopAddress(dto.getShopAddress()); + response.setStoreType(dto.getStoreType()); response.setShopId(dto.getId()); + response.setPointId(dto.getPointId()); response.setLineId(dto.getLineId()); response.setUsername(dto.getUsername()); response.setMobile(dto.getMobile()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index 7a426ba5c..26ccbb1af 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -265,43 +265,44 @@ public class SyncDataServiceImpl implements SyncDataService { if (StringUtils.isBlank(shopInfoDO.getShopCode())) { return null; } + String shopCode = shopInfoDO.getShopCode().trim(); if (String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfoDO.getFranchiseBrand())) { //M10001 - if (shopInfoDO.getShopCode().matches("M\\d*")) { + if (shopCode.matches("M\\d*")) { return "MX" + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; } //FS10001 - if (shopInfoDO.getShopCode().matches("FS\\d*")) { + if (shopCode.matches("FS\\d*")) { return "FS" + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; } // MS10001 - if (shopInfoDO.getShopCode().matches("MS\\d*")) { + if (shopCode.matches("MS\\d*")) { return "MS" + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; } // S10001 - if (shopInfoDO.getShopCode().matches("S\\d*")) { + if (shopCode.matches("S\\d*")) { return shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; } } if (String.valueOf(FranchiseBrandEnum.MZG.getCode()).equals(shopInfoDO.getFranchiseBrand())) { - if (shopInfoDO.getShopCode().matches("MZGM\\d*")) { + if (shopCode.matches("MZGM\\d*")) { return FranchiseBrandEnum.MZG.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; } - if (shopInfoDO.getShopCode().matches("MZGS\\d*")) { + if (shopCode.matches("MZGS\\d*")) { return FranchiseBrandEnum.MZG.getDesc() + shopInfoDO.getShopName(); } } if (String.valueOf(FranchiseBrandEnum.ZJS.getCode()).equals(shopInfoDO.getFranchiseBrand())) { - if (shopInfoDO.getShopCode().matches("LX\\d*")) { + if (shopCode.matches("LX\\d*")) { return "LX" + FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; } - if (shopInfoDO.getShopCode().matches("X\\d*")) { + if (shopCode.matches("X\\d*")) { return "X" + FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; } - if (shopInfoDO.getShopCode().matches("Q\\d*")) { + if (shopCode.matches("Q\\d*")) { return "Q" + FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; } - if (shopInfoDO.getShopCode().matches("Z\\d*")) { + if (shopCode.matches("Z\\d*")) { return FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName(); } }