xiongchao 3 years ago
parent
commit
efe46cb1a7

+ 2 - 2
platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -305,7 +305,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 model.getId(), userIds, mails));
 
         // 发送微信通知给所有维修人角色
-        if(CollectionUtil.isNotEmpty(openIds)){
+        if(CollectionUtil.isNotEmpty(openIds) && BeanUtils.isProd()){
             String mobileDomain = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.SYSTEM_DOMAIN_MOBILE.name());
             if(StringUtils.isBlank(mobileDomain)){
                 throw new BusinessException("请先设置系统域名地址,系统管理-》系统参数配置-》SYSTEM_DOMAIN_MOBILE");
@@ -313,7 +313,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             if(!mobileDomain.endsWith("/")){
                 mobileDomain = mobileDomain + "/";
             }
-            String mobileRepairUrl = mobileDomain + "pages/service-add/service-add?id=" + model.getId();
+            String mobileRepairUrl = mobileDomain + "pages/repair-detail/repair-detail?detailId=" + model.getId();
             for(String openId : openIds){
                 WeChatMessageUtil.repairMessage( openId, mobileRepairUrl,model,sb);
             }

+ 3 - 2
platform-service/src/main/java/com/platform/service/wechat/util/WeChatMessageUtil.java

@@ -94,12 +94,13 @@ public class WeChatMessageUtil {
                                 new String[]{
                                         "有新的报修消息等待您接收",
                                         model.getActualUser(),
-                                        vo.getNo() + "(" + vo.getName() + ")",
+                                        vo.getNo(),
                                         DateUtils.dateToString(model.getApplyTime()),
                                         model.getSbCph(),
                                         model.getContent(),
+                                        vo.getName()
                                 }, new String[]{"#000000",
-                                        "#000000", "#000000", "#000000", "#000000", "#000000" });
+                                        "#000000", "#000000", "#000000", "#000000", "#000000", "#000000" });
                 SpringContextHolder.publishEvent(new WechatEvent(request));
             }
         } catch (Exception e) {