suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cc_20250710_userRegion

Browse Source
This commit is contained in:
shuo.wang
2025-07-11 10:41:04 +08:00
parent d58623a6c2 a2671642ef
commit 825b8cde80
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
View File

@@ -596,7 +596,17 @@ public class DecorationServiceImpl implements DecorationService {
templateParam.put("shopName", shopInfo.getShopName()); templateParam.put("shopName", shopInfo.getShopName());
commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.DESIGN_STAGE, templateParam); commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.DESIGN_STAGE, templateParam);
// 发送企业微信消息 // 发送企业微信消息
sendMeasureUserMessage(request.getShopId(), shopInfo.getInvestmentManager(), MessageEnum.MESSAGE_36); List<EnterpriseUserDO> sendUsers = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.CONSTRUCTION_CUSTOMER, shopInfo.getRegionId());
if (CollectionUtils.isNotEmpty(sendUsers)) {
List<String> sendUserIds = sendUsers.stream().map(enterpriseUserDO -> enterpriseUserDO.getUserId()).collect(Collectors.toList());
HashMap<String, String> 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; return Boolean.TRUE;
} }
} else { } else {

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -777,13 +777,13 @@ public class ShopServiceImpl implements ShopService {
case SHOP_SUB_STAGE_STATUS_11: case SHOP_SUB_STAGE_STATUS_11:
case SHOP_SUB_STAGE_STATUS_21: case SHOP_SUB_STAGE_STATUS_21:
case SHOP_SUB_STAGE_STATUS_50: 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_140:
case SHOP_SUB_STAGE_STATUS_141: case SHOP_SUB_STAGE_STATUS_141:
case SHOP_SUB_STAGE_STATUS_142: case SHOP_SUB_STAGE_STATUS_142:
return getUserFromInvestmentManager(shopInfo.getInvestmentManager()); return getUserFromInvestmentManager(shopInfo.getInvestmentManager());
case SHOP_SUB_STAGE_STATUS_122: 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()); return getUsersByRolesAndRegion(Collections.singletonList(CONSTRUCTION_CUSTOMER), shopInfo.getRegionId());
case SHOP_SUB_STAGE_STATUS_70: case SHOP_SUB_STAGE_STATUS_70:

10
coolstore-partner-web/src/main/resources/application-online.properties
View File

@@ -25,10 +25,12 @@ mybatis.configuration.map-underscore-to-camel-case=true
isv.domain=https://store-isv.coolstore.cn/isv isv.domain=https://store-isv.coolstore.cn/isv
#rocketmq \u914D\u7F6E #rocketmq \u914D\u7F6E
rocketmq.accessKey=LTAI5tJbgtyoHUvofTaeP1RP rocketmq.accessKey=LTAI5tGBwmXwZkMuHK4MudMJ
rocketmq.secretKey=myg755iCx0j4PyQkHMaUVeOr0bw1tA rocketmq.secretKey=bnZoUMRQ9834STgz5E291YrqlBu6yn
rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 rocketmq.nameSrvAdder=http://MQ_INST_1748142459508127_BZegx2xc.cn-hangzhou.mq-internal.aliyuncs.com:8080
rocketmq.topic=simple_message rocketmq.topic=zx_simple_message
rocketmq.orderTopic=zx_order_message
#oss配置 #oss配置
oss.accessKeyId=LTAI5tGBwmXwZkMuHK4MudMJ oss.accessKeyId=LTAI5tGBwmXwZkMuHK4MudMJ

10
coolstore-partner-web/src/main/resources/application-test.properties
View File

@@ -26,10 +26,12 @@ mybatis.configuration.map-underscore-to-camel-case=true
isv.domain=https://abstore-isv.coolstore.cn/isv isv.domain=https://abstore-isv.coolstore.cn/isv
#rocketmq \u914D\u7F6E #rocketmq \u914D\u7F6E
rocketmq.accessKey=LTAI5tJbgtyoHUvofTaeP1RP rocketmq.accessKey=LTAI5tGBwmXwZkMuHK4MudMJ
rocketmq.secretKey=myg755iCx0j4PyQkHMaUVeOr0bw1tA rocketmq.secretKey=bnZoUMRQ9834STgz5E291YrqlBu6yn
rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq.aliyuncs.com:80 rocketmq.nameSrvAdder=http://MQ_INST_1748142459508127_BZegx2xc.cn-hangzhou.mq-internal.aliyuncs.com:8080
rocketmq.topic=simple_message rocketmq.topic=zx_simple_message
rocketmq.orderTopic=zx_order_message
#oss配置 #oss配置
#oss.host=https://oss-store.coolcollege.cn/ #oss.host=https://oss-store.coolcollege.cn/