From bbd03472d9749297d9a104110929a84e1881ff18 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 30 Apr 2025 15:15:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=94=BE=E5=BC=80?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E6=B5=8B=E9=87=8F=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/constants/CommonConstants.java | 2 +- .../com/cool/store/enums/ErrorCodeEnum.java | 2 +- .../com/cool/store/enums/MessageEnum.java | 2 + .../com/cool/store/dao/OrderSysInfoDAO.java | 3 ++ .../com/cool/store/dao/ShopAccountDAO.java | 4 ++ .../cool/store/mapper/OrderSysInfoMapper.java | 3 ++ .../cool/store/mapper/ShopAccountMapper.java | 3 ++ .../resources/mapper/OrderSysInfoMapper.xml | 8 +++ .../resources/mapper/ShopAccountMapper.xml | 5 ++ .../store/service/ShopAccountService.java | 3 ++ .../impl/DecorationMeasureServiceImpl.java | 21 ++++++-- .../store/service/impl/ExportServiceImpl.java | 6 +-- .../service/impl/ShopAccountServiceImpl.java | 49 +++++++++++++++++++ .../impl/SignFranchiseServiceImpl.java | 14 ++++-- 14 files changed, 112 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index b4209de23..fa9635621 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -31,7 +31,7 @@ public class CommonConstants { public static final int TEN_SECONDS = 10000; public static final int ONE_SECONDS = 1000; - public static final int TOW_SECONDS = 2000; + public static final int FIVE_SECONDS = 5000; public static final int MAX_EXPORT_SIZE = 10000; /** 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 024503b82..5f55333b6 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 @@ -255,7 +255,7 @@ public enum ErrorCodeEnum { GET_YLS_CODE_FAIL(151006,"系统无云流水编码！无法获取TOKEN！请先维护该编码",null), BANK_EXIST(151007,"当前银行已存在，请直接选择！",null), - EXPORT_LIMIT_1000(151008,"导出数据不能超过1000条，请增加筛选条件，减少导出数量",null), + EXPORT_LIMIT_5000(151008,"导出数据不能超过5000条，请增加筛选条件，减少导出数量",null), ; 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 c5abccf20..4dbb56518 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 @@ -82,6 +82,8 @@ public enum MessageEnum { MESSAGE_54("您有一个门店建店资料待审核，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_55("您有一个门店设计阶段待提交，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_56("您有一个门店测量阶段待提交，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_57("您有一个门店测量阶段待分配测量员和设计组，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_58("您有一个门店设计阶段待分配设计师，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), ; private String title; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/OrderSysInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OrderSysInfoDAO.java index f3107d690..20aa24e81 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/OrderSysInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OrderSysInfoDAO.java @@ -46,4 +46,7 @@ public class OrderSysInfoDAO { } return orderSysInfoMapper.getSpecificByShopIdList(shopIdList); } + public Integer updateAddresseeAddress(OrderSysInfoDO orderSysInfoDO){ + return orderSysInfoMapper.updateAddresseeAddress(orderSysInfoDO); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java index 6ad64aa1a..f412105d5 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java @@ -157,5 +157,9 @@ public class ShopAccountDAO { return shopAccountMapper.getSpecificByShopIds(shopIds); } + //数据处理用 + public List getPasswordIsNull(){ + return shopAccountMapper.getPasswordIsNull(); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OrderSysInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OrderSysInfoMapper.java index 02d219390..02c83b3be 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OrderSysInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OrderSysInfoMapper.java @@ -16,4 +16,7 @@ import java.util.List; public interface OrderSysInfoMapper extends Mapper { List getSpecificByShopIdList(@Param("list") List shopIdList); + + Integer updateAddresseeAddress(@Param("update") OrderSysInfoDO orderSysInfoDO); + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java index aea1dc6c7..6d298251a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java @@ -96,6 +96,9 @@ public interface ShopAccountMapper extends Mapper { */ List getSpecificByShopIds(@Param("shopIds") List shopIds); + //数据处理用 + List getPasswordIsNull(); + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml index 2e1cb2c8c..e27235e66 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml @@ -41,6 +41,14 @@ receiving_create_time, receiving_update_time, receiving_create_user, receiving_update_user, declare_goods_type + + update xfsg_order_sys_info + + set addressee_address = #{update.addresseeAddress} + + + where shop_id = #{update.shopId} + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopAccountService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopAccountService.java index 113c32f52..dfa4c76fc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopAccountService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopAccountService.java @@ -86,4 +86,7 @@ public interface ShopAccountService { */ Boolean handleOldData(); + // 处理账户表没有密码的 + Boolean handleAccountPassword(); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java index f904a34cd..d2771c142 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java @@ -4,16 +4,14 @@ import cn.hutool.core.bean.BeanUtil; import com.cool.store.constants.CommonConstants; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.DecorationMeasureDAO; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.ShopInfoDAO; -import com.cool.store.dao.ShopStageInfoDAO; +import com.cool.store.dao.*; import com.cool.store.entity.DecorationMeasureDO; import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.ShopInfoDO; import com.cool.store.entity.ShopStageInfoDO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.MessageEnum; +import com.cool.store.enums.UserRoleEnum; import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; @@ -33,6 +31,8 @@ import java.util.*; @RequiredArgsConstructor public class DecorationMeasureServiceImpl implements DecorationMeasureService { + @Resource + private EnterpriseUserRoleDao enterpriseUserRoleDao; private final DecorationMeasureDAO decorationMeasureDAO; private final EnterpriseUserDAO enterpriseUserDAO; private final RedisUtilPool redisUtilPool; @@ -106,7 +106,18 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_862, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90)); // 给测量员发送企业微信消息 + List headOfDesignList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.HEAD_OF_DESIGN.getCode())); sendMeasureUserMessage(request.getShopId(), request.getMeasureUserId()); + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId()); + HashMap map = new HashMap<>(4); + map.put("partnerUsername", lineInfo.getUsername()); + map.put("partnerMobile", lineInfo.getMobile()); + map.put("storeName", shopInfo.getShopName()); + commonService.sendQWMessage(headOfDesignList, + MessageEnum.MESSAGE_58, + map + ); } return Boolean.TRUE; } @@ -127,7 +138,7 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { map.put("storeName", shopInfo.getShopName()); commonService.sendQWMessage( Collections.singletonList(userId), - MessageEnum.MESSAGE_55, + MessageEnum.MESSAGE_56, map ); } 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 5a54eb9cb..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 @@ -102,14 +102,14 @@ public class ExportServiceImpl implements ExportService { @Override public Long exportProgressBase(BranchShopRequest request, LoginUserInfo user, FileTypeEnum fileTypeEnum) { - request.setPageSize(CommonConstants.ONE_SECONDS+10); + request.setPageSize(CommonConstants.FIVE_SECONDS+10); request.setPageNum(CommonConstants.ONE); PageInfo branchShopList = shopService.getBranchShopList(request, user.getUserId()); long total = branchShopList.getTotal(); if (total == CommonConstants.ZERO) { return CommonConstants.ZERO_LONG; - } else if (total > CommonConstants.ONE_SECONDS) { - throw new ServiceException(ErrorCodeEnum.EXPORT_LIMIT_1000); + } else if (total > CommonConstants.FIVE_SECONDS) { + throw new ServiceException(ErrorCodeEnum.EXPORT_LIMIT_5000); } ImportTaskDO importTaskDO = new ImportTaskDO(); importTaskDO.setStatus(ImportStatusEnum.Ongoing.getCode()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java index 07244c50e..3ae3edd3b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java @@ -312,5 +312,54 @@ public class ShopAccountServiceImpl implements ShopAccountService { return true; } + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean handleAccountPassword() { + List shopIdList = shopAccountDAO.getPasswordIsNull(); + if (CollectionUtils.isEmpty(shopIdList)){ + return false; + } + List shopList = shopInfoDAO.getShopListByIds(shopIdList); + Map> shopMap = shopList.stream().collect(Collectors.groupingBy(ShopInfoDO::getPartnerId)); + Set partnerIds = shopList.stream().map(ShopInfoDO::getPartnerId).collect(Collectors.toSet()); + Set lineIdSet = shopList.stream().map(ShopInfoDO::getLineId).collect(Collectors.toSet()); + List hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(new ArrayList<>(partnerIds)); + List qualificationsInfoDOList = qualificationsInfoDAO.getByLineIds(new ArrayList<>(lineIdSet)); + Map qualificationsInfoDOMap = qualificationsInfoDOList.stream().collect(Collectors.toMap(QualificationsInfoDO::getPartnerId, Function.identity())); + List updateList = new ArrayList<>(); + for (HyPartnerUserInfoDO hyPartnerUserInfoDO : hyPartnerUserInfoDOS) { + QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDOMap.get(hyPartnerUserInfoDO.getPartnerId()); + List shopInfos = shopMap.get(hyPartnerUserInfoDO.getPartnerId()); + List shopIds = shopInfos.stream().map(ShopInfoDO::getId).collect(Collectors.toList()); + List accountDOList = shopAccountDAO.getByShopIds(shopIds); + String substring = qualificationsInfoDO.getIdCardNo().substring(qualificationsInfoDO.getIdCardNo().length() - 6); + //生成密码和盐值 + byte[] saltBytes = PasswordUtil.generateSalt(); + String salt = PasswordUtil.bytesToHex(saltBytes); + String password = PasswordUtil.encryptPassword(substring, salt); + GetPasswordDTO getPasswordDTO = new GetPasswordDTO(); + getPasswordDTO.setPassword(substring); + String downstreamSystemSecondaryPassword = thirdXinGuanJiaService.getPassword(getPasswordDTO); + // 修改用户表 + hyPartnerUserInfoDO.setDownstreamSystemPassword(password); + hyPartnerUserInfoDO.setDownstreamSystemSalting(salt); + hyPartnerUserInfoDO.setDownstreamSystemSecondaryPassword(downstreamSystemSecondaryPassword); + //循环修改 门店账户表 + for (ShopAccountDO shopAccountDO : accountDOList) { + if (shopAccountDO.getSystemName().equals(ShopAccountEnum.YLS.getSystemName()) + || shopAccountDO.getSystemName().equals(ShopAccountEnum.XZG.getSystemName()) + || shopAccountDO.getSystemName().equals(ShopAccountEnum.HUOMA.getSystemName())) { + shopAccountDO.setPassword(password); + shopAccountDO.setPasswordSalt(salt); + shopAccountDO.setSecondaryPassword(downstreamSystemSecondaryPassword); + updateList.add(shopAccountDO); + } + } + } + shopAccountDAO.dateHandle(updateList); + hyPartnerUserInfoDAO.dataHandle(hyPartnerUserInfoDOS); + return true; + } + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 40108236a..25cd4bc46 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; import com.cool.store.context.LoginUserInfo; +import com.cool.store.dao.EnterpriseUserRoleDao; import com.cool.store.dao.OrderSysInfoDAO; import com.cool.store.dao.QualificationsInfoDAO; import com.cool.store.dao.ShopStageInfoDAO; @@ -42,6 +43,8 @@ import java.util.stream.Collectors; @Service @Slf4j public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResultService { + @Resource + private EnterpriseUserRoleDao enterpriseUserRoleDao; @Resource SignFranchiseMapper signFranchiseMapper; @@ -192,9 +195,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu if (Objects.nonNull(userDOList)) { finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } -// commonService.sendQWMessage(finances, -// MessageEnum.MESSAGE_34, -// map); + List liGuiNeiQinList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.CONSTRUCTION_CUSTOMER.getCode())); + commonService.sendQWMessage(liGuiNeiQinList, + MessageEnum.MESSAGE_57, + map); commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()), MessageEnum.MESSAGE_35, map); @@ -219,6 +223,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu orderSysInfoDO = new OrderSysInfoDO(); orderSysInfoDO.setShopId(request.getShopId()); orderSysInfoDAO.insertSelective(orderSysInfoDO); + }else{ + //同步建店资料地址 + orderSysInfoDO.setAddresseeAddress(request.getDetailAddress()); + orderSysInfoDAO.updateAddresseeAddress(orderSysInfoDO); } return new ResponseResult(200000, "提交成功"); } else { From ec046b09e0659687961509aacfd9a68ca4ab30a9 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 30 Apr 2025 15:26:12 +0800 Subject: [PATCH 2/5] fix --- .../cool/store/controller/webb/ShopAccountController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java index 59e080abd..bb274c2c8 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java @@ -79,6 +79,12 @@ public class ShopAccountController { return ResponseResult.success(accountService.handleOldData()); } + @ApiOperation("密码数据处理2.0") + @GetMapping("/handleAccountPassword") + public ResponseResult handleAccountPassword() { + return ResponseResult.success(accountService.handleAccountPassword()); + } + } From a19f83434c4800225c83662a6b40b2aa5f9d0958 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 30 Apr 2025 15:53:41 +0800 Subject: [PATCH 3/5] fix --- .../impl/DecorationMeasureServiceImpl.java | 32 +++++++++++-------- .../impl/SignFranchiseServiceImpl.java | 6 ++-- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java index d2771c142..90fc4eafc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java @@ -93,6 +93,8 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_862, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90)); // 给测量员发送企业微信消息 sendMeasureUserMessage(request.getShopId(), request.getMeasureUserId()); + //企微通知设计组长 + sendHeadDesign(request); return Boolean.TRUE; } // 处理状态862->863 @@ -105,23 +107,27 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { // 更新设计状态和测量状态 shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_862, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90)); - // 给测量员发送企业微信消息 - List headOfDesignList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.HEAD_OF_DESIGN.getCode())); - sendMeasureUserMessage(request.getShopId(), request.getMeasureUserId()); - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); - LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId()); - HashMap map = new HashMap<>(4); - map.put("partnerUsername", lineInfo.getUsername()); - map.put("partnerMobile", lineInfo.getMobile()); - map.put("storeName", shopInfo.getShopName()); - commonService.sendQWMessage(headOfDesignList, - MessageEnum.MESSAGE_58, - map - ); + //企微通知设计组长 + sendHeadDesign(request); } return Boolean.TRUE; } + private void sendHeadDesign(DecorationMeasureRequest request) { + List headOfDesignList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.HEAD_OF_DESIGN.getCode())); + sendMeasureUserMessage(request.getShopId(), request.getMeasureUserId()); + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId()); + HashMap map = new HashMap<>(4); + map.put("partnerUsername", lineInfo.getUsername()); + map.put("partnerMobile", lineInfo.getMobile()); + map.put("storeName", shopInfo.getShopName()); + commonService.sendQWMessage(headOfDesignList, + MessageEnum.MESSAGE_58, + map + ); + } + /** * 发送测量消息给测量员 */ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 25cd4bc46..ca2f1e226 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -199,9 +199,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu commonService.sendQWMessage(liGuiNeiQinList, MessageEnum.MESSAGE_57, map); - commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()), - MessageEnum.MESSAGE_35, - map); +// commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()), +// MessageEnum.MESSAGE_35, +// map); commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()), MessageEnum.MESSAGE_26, map); From 04e0cc4f089f20256fe4e8bac42687b95eb27a43 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 30 Apr 2025 16:28:00 +0800 Subject: [PATCH 4/5] fix --- .../cool/store/service/impl/DecorationMeasureServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java index 90fc4eafc..20ef67295 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java @@ -114,15 +114,13 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { } private void sendHeadDesign(DecorationMeasureRequest request) { - List headOfDesignList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.HEAD_OF_DESIGN.getCode())); - sendMeasureUserMessage(request.getShopId(), request.getMeasureUserId()); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId()); HashMap map = new HashMap<>(4); map.put("partnerUsername", lineInfo.getUsername()); map.put("partnerMobile", lineInfo.getMobile()); map.put("storeName", shopInfo.getShopName()); - commonService.sendQWMessage(headOfDesignList, + commonService.sendQWMessage(Collections.singletonList(request.getDesignUserId()), MessageEnum.MESSAGE_58, map ); From 0be5ce127e44498d66e9f6f278173cbda66dbf54 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 30 Apr 2025 17:35:57 +0800 Subject: [PATCH 5/5] fix --- .../cool/store/service/impl/DecorationMeasureServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java index 20ef67295..1f05d6cdd 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java @@ -107,6 +107,8 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { // 更新设计状态和测量状态 shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_862, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90)); + //通知测量员 + sendMeasureUserMessage(request.getShopId(), request.getMeasureUserId()); //企微通知设计组长 sendHeadDesign(request); }