Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/dronepilot/impl/PilotCertificationServiceImpl.java

@@ -353,7 +353,9 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
             if(touser != null){
                 JSONObject jsonObject = spellMsg("飞手执照及能力认证","审核通过");
                 ws.setTouser(touser);
-                ws.setTemplateId("9qvgBhfW9yoQJY91iMfhrog8y5eZUPSbo9PLvQzS_vk");
+//                ws.setTemplateId("9qvgBhfW9yoQJY91iMfhrog8y5eZUPSbo9PLvQzS_vk");
+                // 新的公众号消息模版
+                ws.setTemplateId("4s0xcovQfT89MYPkUEesBsPD_ONRMPsx_9jxi61Qd-c");
                 ws.setDataObject(jsonObject);
                 wxService.sendSubTemplateMsg(ws);
             }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/impl/WithdrawalServiceImpl.java

@@ -258,9 +258,12 @@ public class WithdrawalServiceImpl implements WithdrawalService {
         UserSubInfoDO info = userSubInfoDao.getUserSubInfoByUnionId(unionId);
         if(info != null && info.getOpenId() != null){
             String touser = info.getOpenId();
-            JSONObject jsonObject = spellMsg(applyInfo.getEmpName(), applyInfo.getPayAmount(), applyInfo.getPayAccount());
+//            JSONObject jsonObject = spellMsg(applyInfo.getEmpName(), applyInfo.getPayAmount(), applyInfo.getPayAccount());
+            // 新的公众号修改
+            JSONObject jsonObject = spellMsg(applyInfo.getPayAmount(), applyInfo.getPayAccount());
             ws.setTouser(touser);
-            ws.setTemplateId("y6PHvZownxqR5hf4dSXaa2Lp1jeq3ccytd6G-kUQla4");
+//            ws.setTemplateId("y6PHvZownxqR5hf4dSXaa2Lp1jeq3ccytd6G-kUQla4");
+            ws.setTemplateId("imUvk_v7ogKV-LcavombKoFZT1NrSFDAFyMJU-W8bBI");
             ws.setDataObject(jsonObject);
             wxService.sendSubTemplateMsg(ws);
         }
@@ -306,28 +309,48 @@ public class WithdrawalServiceImpl implements WithdrawalService {
         return cashAmountDTO;
     }
 
-    public JSONObject spellMsg(String empName, Double payAmount, String payAccount){
+//    public JSONObject spellMsg(String empName, Double payAmount, String payAccount){
+//        JSONObject data=new JSONObject();
+//
+//        //提现商户：{{keyword1.DATA}}
+//        JSONObject keyword1=new JSONObject();
+//        keyword1.put("value",empName);
+//        data.put("keyword1",keyword1);
+//
+//        //提现金额：{{keyword2.DATA}}
+//        JSONObject keyword2=new JSONObject();
+//        keyword2.put("value",payAmount);
+//        data.put("keyword2",keyword2);
+//
+//        //提现账户：{{keyword3.DATA}}
+//        JSONObject keyword3=new JSONObject();
+//        keyword3.put("value",payAccount);
+//        data.put("keyword3",keyword3);
+//
+//        //处理时间：{{keyword4.DATA}}
+//        JSONObject keyword4=new JSONObject();
+//        keyword4.put("value",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+//        data.put("keyword4",keyword4);
+//        return data;
+//    }
+//    新的公众号消息推送
+    public JSONObject spellMsg(Double payAmount, String payAccount){
         JSONObject data=new JSONObject();
 
-        //提现商户：{{keyword1.DATA}}
-        JSONObject keyword1=new JSONObject();
-        keyword1.put("value",empName);
-        data.put("keyword1",keyword1);
+        //提现金额：{{amount1.DATA}}
+        JSONObject amount1=new JSONObject();
+        amount1.put("value",payAmount);
+        data.put("amount1",amount1);
 
-        //提现金额：{{keyword2.DATA}}
-        JSONObject keyword2=new JSONObject();
-        keyword2.put("value",payAmount);
-        data.put("keyword2",keyword2);
+        //提现账户：{{character_string2.DATA}}
+        JSONObject character_string2=new JSONObject();
+        character_string2.put("value",payAccount);
+        data.put("character_string2",character_string2);
 
-        //提现账户：{{keyword3.DATA}}
-        JSONObject keyword3=new JSONObject();
-        keyword3.put("value",payAccount);
-        data.put("keyword3",keyword3);
-
-        //处理时间：{{keyword4.DATA}}
-        JSONObject keyword4=new JSONObject();
-        keyword4.put("value",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        data.put("keyword4",keyword4);
+        //处理时间：{{time7.DATA}}
+        JSONObject time7=new JSONObject();
+        time7.put("value",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        data.put("keyword4",time7);
         return data;
     }
 

csm-service/cms-service-user/src/main/resources/application-dev.yml

@@ -53,8 +53,11 @@ spring:
 wx:
   #公众号
   sub:
-    appid: wx5c6a105a0ddca4c5
-    secret: ${WECHAT_SUB_SECRET}
+#    appid: wx5c6a105a0ddca4c5
+#    secret: 96c75255dd26f82f8d55e15b59e101c7
+#    新的公众号配置信息
+    appid: wx50b22db275f8c320
+    secret: 7b609851705dd22114fff636d0a2fc4a
   #小程序
   app:
     id: wx18b7883acd204278

csm-service/cms-service-user/src/main/resources/application-local.yml

@@ -22,8 +22,11 @@ spring:
 
 wx:
   sub:
-    appid: wx5c6a105a0ddca4c5
-    secret: 96c75255dd26f82f8d55e15b59e101c7
+#    appid: wx5c6a105a0ddca4c5
+#    secret: 96c75255dd26f82f8d55e15b59e101c7
+#    新的公众号配置信息
+    appid: wx50b22db275f8c320
+    secret: 7b609851705dd22114fff636d0a2fc4a
   app:
     id: wx18b7883acd204278
     secret: 28afe74ba373830237a8133a7431ee82

csm-service/cms-service-user/src/main/resources/application-prod.yml

@@ -51,8 +51,11 @@ spring:
 
 wx:
   sub:
-    appid: wx5c6a105a0ddca4c5
-    secret: ${WECHAT_SUB_SECRET}
+#    appid: wx5c6a105a0ddca4c5
+#    secret: ${WECHAT_SUB_SECRET}
+#    新的公众号配置信息
+    appid: wx50b22db275f8c320
+    secret: 7b609851705dd22114fff636d0a2fc4a
   app:
     id: wx18b7883acd204278
     secret: ${WECHAT_APPLET_SECRET}

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 679ca4db1456e36db20111c8d4d086d33ca31b31
+  newTag: 6f289d717ae93216d64106035254c3f9f5b19a00