bug

src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java

@@ -548,4 +548,47 @@ public class MiniAppServiceImpl implements IMiniAppService {
 
         return taMiniappMapper.selectOne(queryWrapper);
     }
+
+    public void sendContractMessage(TaPerson toUser, String link, String name, String result, String programName,
+                                    String failReason, String remark, LocalDateTime dt, Boolean isSuccess) {
+
+        TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
+        if (null == miniapp) {
+            log.error("小程序 {} 不存在", toUser.getMiniappId());
+            return;
+        }
+
+        // 消息内容类型
+        String contentType = CommConstant.MESSAGE_CONTENT_OF_HOUSE;
+        TaMiniappTemplate tpl = getTplByType(contentType, toUser.getMiniappId());
+        boolean isSubscribe = null != tpl && (null == tpl.getIsSubscribe() ? false : tpl.getIsSubscribe());
+        // 消息发送类型
+        String messageType = null == tpl ? CommConstant.MESSAGE_TYPE_OF_SMS :
+                isSubscribe ? CommConstant.MESSAGE_TYPE_OF_MINIAPP_SUBSCRIBE : CommConstant.MESSAGE_TYPE_OF_MINIAPP_TEMPLATE;
+
+        String[] smsParams = {programName, "电子合同待签署"};
+
+        if (null == tpl) {
+            if (isSuccess) {
+                log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), contentType);
+                // 短信发送
+                sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), "contract", smsParams);
+            }
+        } else {
+            if (isSubscribe) {
+                String[] data = new String[]{name, result, programName, remark, failReason, DateUtils.cutSecond(dt)};
+                ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+                if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                    // 使用短信发送
+                    sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), "contract", smsParams);
+                    messageType = CommConstant.MESSAGE_TYPE_OF_SMS;
+                }
+            } else {
+                log.info("发送模板消息");
+            }
+        }
+        // TODO 写消息发送日志
+        // 更新消息发送时间
+        iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, "contract", toUser.getOrgId());
+    }
 }

src/main/java/com/huiju/estateagents/service/impl/TaRaiseRecordServiceImpl.java

@@ -335,6 +335,9 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
             String link = String.format(CommConstant.RAISE_DETAIL_PATH, raiseRecordId);
 
             miniAppService.sendCheckMessage(toUser, link, title, result, taBuilding.getBuildingName(), reason, remark, LocalDateTime.now(), isSuccess);
+            if(title.equals("电子合同")){
+                miniAppService.sendContractMessage(toUser, link, title, result, taBuilding.getBuildingName(), reason, remark, LocalDateTime.now(), isSuccess);
+            }
             logger.info("sendSubscribeMsg 结束");
         });
     }

src/main/resources/application-prod-blue.yml

@@ -85,13 +85,13 @@ pay-refund: https://lt.pawoma.cn/api/refund/
 
 #法大大服务器地址
 fadada:
-  appId: "403057"
-  appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
+  appId: "500261"
+  appSecret: "go9yihmg7abS2lIBZpZ2yLSW"
   version: "2.0"
-  authServeHost: "http://test.api.fabigbig.com:8888/api/"
-  serveHost: "https://testapi08.fadada.com/api/"
-  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
-  authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
-  authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
-  signNotify: "https://dev.pawoma.cn/api/fadd/sign"
-  redirectUrl: "https://dev.pawoma.cn/other/redirect.html"
+  authServeHost: "https://textapi.fadada.com/api2/"
+  serveHost: "https://textapi.fadada.com/api2/"
+  companyNotify: "https://wx.fangdeal.cn/api/fadd/company"
+  authReturnUrl: "http://wx.fangdeal.cn/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://wx.fangdeal.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://wx.fangdeal.cn/api/fadd/sign"
+  redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"

src/main/resources/application-prod-green.yml

@@ -85,13 +85,13 @@ pay-refund: https://lt.pawoma.cn/api/refund/
 
 #法大大服务器地址
 fadada:
-  appId: "403057"
-  appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
+  appId: "500261"
+  appSecret: "go9yihmg7abS2lIBZpZ2yLSW"
   version: "2.0"
-  authServeHost: "http://test.api.fabigbig.com:8888/api/"
-  serveHost: "https://testapi08.fadada.com/api/"
-  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
-  authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
-  authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
-  signNotify: "https://dev.pawoma.cn/api/fadd/sign"
-  redirectUrl: "https://dev.pawoma.cn/other/redirect.html"
+  authServeHost: "https://textapi.fadada.com/api2/"
+  serveHost: "https://textapi.fadada.com/api2/"
+  companyNotify: "https://wx.fangdeal.cn/api/fadd/company"
+  authReturnUrl: "http://wx.fangdeal.cn/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://wx.fangdeal.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://wx.fangdeal.cn/api/fadd/sign"
+  redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"