From e3b177261be7cb06e17a3d37ea94f3932e49b396 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 9 Jul 2025 10:28:40 +0800 Subject: [PATCH 1/2] mq fix --- .../src/main/resources/application-online.properties | 10 ++++++---- .../src/main/resources/application-test.properties | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 88bcd9149..59867a8b7 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -25,10 +25,12 @@ mybatis.configuration.map-underscore-to-camel-case=true isv.domain=https://store-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E -rocketmq.accessKey=LTAI5tJbgtyoHUvofTaeP1RP -rocketmq.secretKey=myg755iCx0j4PyQkHMaUVeOr0bw1tA -rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 -rocketmq.topic=simple_message +rocketmq.accessKey=LTAI5tGBwmXwZkMuHK4MudMJ +rocketmq.secretKey=bnZoUMRQ9834STgz5E291YrqlBu6yn +rocketmq.nameSrvAdder=http://MQ_INST_1748142459508127_BZegx2xc.cn-hangzhou.mq-internal.aliyuncs.com:8080 +rocketmq.topic=zx_simple_message +rocketmq.orderTopic=zx_order_message + #oss配置 oss.accessKeyId=LTAI5tGBwmXwZkMuHK4MudMJ diff --git a/coolstore-partner-web/src/main/resources/application-test.properties b/coolstore-partner-web/src/main/resources/application-test.properties index 2a28827b2..c3818e5ea 100644 --- a/coolstore-partner-web/src/main/resources/application-test.properties +++ b/coolstore-partner-web/src/main/resources/application-test.properties @@ -26,10 +26,12 @@ mybatis.configuration.map-underscore-to-camel-case=true isv.domain=https://abstore-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E -rocketmq.accessKey=LTAI5tJbgtyoHUvofTaeP1RP -rocketmq.secretKey=myg755iCx0j4PyQkHMaUVeOr0bw1tA -rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq.aliyuncs.com:80 -rocketmq.topic=simple_message +rocketmq.accessKey=LTAI5tGBwmXwZkMuHK4MudMJ +rocketmq.secretKey=bnZoUMRQ9834STgz5E291YrqlBu6yn +rocketmq.nameSrvAdder=http://MQ_INST_1748142459508127_BZegx2xc.cn-hangzhou.mq-internal.aliyuncs.com:8080 +rocketmq.topic=zx_simple_message +rocketmq.orderTopic=zx_order_message + #oss配置 #oss.host=https://oss-store.coolcollege.cn/ From 6737018f657870f1a8fc5f24e2910251fe164dcb Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 9 Jul 2025 17:35:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=BD=E5=B7=A5=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BA=BA=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/DecorationServiceImpl.java | 12 +++++++++++- .../com/cool/store/service/impl/ShopServiceImpl.java | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) 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 d430d42d7..e5fdb1dac 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 @@ -596,7 +596,17 @@ public class DecorationServiceImpl implements DecorationService { templateParam.put("shopName", shopInfo.getShopName()); commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.DESIGN_STAGE, templateParam); // 发送企业微信消息 - sendMeasureUserMessage(request.getShopId(), shopInfo.getInvestmentManager(), MessageEnum.MESSAGE_36); + List sendUsers = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.CONSTRUCTION_CUSTOMER, shopInfo.getRegionId()); + if (CollectionUtils.isNotEmpty(sendUsers)) { + List sendUserIds = sendUsers.stream().map(enterpriseUserDO -> enterpriseUserDO.getUserId()).collect(Collectors.toList()); + HashMap map = new HashMap<>(); + map.put("partnerUsername", lineInfo.getUsername()); + map.put("partnerMobile", lineInfo.getMobile()); + map.put("storeName", shopInfo.getShopName()); + commonService.sendQWMessage(sendUserIds, + MessageEnum.MESSAGE_37, + map); + } return Boolean.TRUE; } } else { 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 69f0f0ae3..908e6e62a 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 @@ -777,13 +777,13 @@ public class ShopServiceImpl implements ShopService { case SHOP_SUB_STAGE_STATUS_11: case SHOP_SUB_STAGE_STATUS_21: case SHOP_SUB_STAGE_STATUS_50: - case SHOP_SUB_STAGE_STATUS_110: - case SHOP_SUB_STAGE_STATUS_111: case SHOP_SUB_STAGE_STATUS_140: case SHOP_SUB_STAGE_STATUS_141: case SHOP_SUB_STAGE_STATUS_142: return getUserFromInvestmentManager(shopInfo.getInvestmentManager()); case SHOP_SUB_STAGE_STATUS_122: + case SHOP_SUB_STAGE_STATUS_110: + case SHOP_SUB_STAGE_STATUS_111: return getUsersByRolesAndRegion(Collections.singletonList(CONSTRUCTION_CUSTOMER), shopInfo.getRegionId()); case SHOP_SUB_STAGE_STATUS_70: