From c5bcfee942ddbd79f53db78cb433ad379c83cc9b Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 6 May 2025 17:18:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=20=E5=BC=80=E5=BA=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E5=90=8C=E7=AD=BE=E7=BA=A6=EF=BC=8C?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=BC=96=E7=A0=81trim=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E6=B2=A1=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/ShopInfoMapper.xml | 6 ++++++ .../resources/mapper/ShopStageInfoMapper.xml | 1 + .../store/dto/Preparation/PreparationDTO.java | 5 +++++ .../cool/store/request/BranchShopRequest.java | 4 ++++ .../store/service/impl/ShopServiceImpl.java | 5 +++-- .../service/impl/SyncDataServiceImpl.java | 21 ++++++++++--------- 6 files changed, 30 insertions(+), 12 deletions(-) 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/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 7701df97c..171e168c1 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,6 +506,7 @@ 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.setLineId(dto.getLineId()); response.setUsername(dto.getUsername()); 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(); } } From d64f99b568c26800dc1d533c5d14cc0b28fabdef Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 6 May 2025 18:36:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix=20=E5=BC=80=E5=BA=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E5=90=8C=E7=AD=BE=E7=BA=A6=EF=BC=8C?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=BC=96=E7=A0=81trim=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E6=B2=A1=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/enums/MessageEnum.java | 1 + .../store/service/impl/DecorationServiceImpl.java | 13 +++++++++++++ .../cool/store/service/impl/ExportServiceImpl.java | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) 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-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/ExportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java index e954c5d24..b56213f55 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java @@ -108,7 +108,7 @@ public class ExportServiceImpl implements ExportService { long total = branchShopList.getTotal(); if (total == CommonConstants.ZERO) { return CommonConstants.ZERO_LONG; - } else if (total > CommonConstants.FIVE_SECONDS) { + } else if (total > 1) { throw new ServiceException(ErrorCodeEnum.EXPORT_LIMIT_5000); } ImportTaskDO importTaskDO = new ImportTaskDO(); From 9256c48b013483fe45b98387b2d3e38d3cd6c502 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 6 May 2025 18:39:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=20=E5=BC=80=E5=BA=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E5=90=8C=E7=AD=BE=E7=BA=A6=EF=BC=8C?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=BC=96=E7=A0=81trim=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E6=B2=A1=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/ShopServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 171e168c1..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 @@ -508,6 +508,7 @@ public class ShopServiceImpl implements ShopService { 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()); From 434b9ff6f83e3a89cc676e2f900d971a0afe300e Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 6 May 2025 18:43:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=20=E5=BC=80=E5=BA=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E5=90=8C=E7=AD=BE=E7=BA=A6=EF=BC=8C?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=BC=96=E7=A0=81trim=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E6=B2=A1=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/ExportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java index b56213f55..e954c5d24 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java @@ -108,7 +108,7 @@ public class ExportServiceImpl implements ExportService { long total = branchShopList.getTotal(); if (total == CommonConstants.ZERO) { return CommonConstants.ZERO_LONG; - } else if (total > 1) { + } else if (total > CommonConstants.FIVE_SECONDS) { throw new ServiceException(ErrorCodeEnum.EXPORT_LIMIT_5000); } ImportTaskDO importTaskDO = new ImportTaskDO();