推送收款微信模板消息调试

src/main/java/com/caimei365/order/components/WeChatService.java

@@ -298,8 +298,8 @@ public class WeChatService {
         keyword2.put("value", time);
         keyword2.put("color", "#c4c400");
         JSONObject remark = new JSONObject();
-        keyword2.put("value", remarkText);
-        keyword2.put("color", "#c4c400");
+        remark.put("value", remarkText);
+        remark.put("color", "#c4c400");
 
         JSONObject data = new JSONObject();
         data.put("first", first);

src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -1173,13 +1173,13 @@ public class ReceiptServiceImpl implements ReceiptService {
             String accessToken = weChatService.getAccessToken();
             List<String> openidList = receiptMapper.getOpenidListByPermission(Collections.singletonList(7));
             openidList.removeIf(Objects::isNull);
-            double associateAmount = receiptMapper.countAssociateAmountById(receipt.getId());
+            double associateAmount = receiptMapper.countAssociateAmountById(receiptPo.getId());
             String associateTitle = "收款和订单已确认关联，请及时审核！";
-            String associateDate = receipt.getReceiptDate();
-            String associateType = receiptMapper.getReceiptTypeStrById(receipt.getPayType());
-            String remarkText = "收款类型：" + associateType + "，确认时间："+receipt.getConfirmDate();
+            String associateDate = receiptPo.getReceiptDate();
+            String associateType = receiptMapper.getReceiptTypeStrById(receiptPo.getPayType());
+            String remarkText = "收款类型：" + associateType + "，确认时间："+receiptPo.getConfirmDate();
             // 跳转到【普通款项待审核】页面
-            String pagePath = "pages/relation/ordinary/examine-detail?id="+receipt.getId();
+            String pagePath = "pages/login/login-share?id="+receiptPo.getId();
             for (String openid : openidList) {
                 // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
                 weChatService.sendTemplateMsg(accessToken, openid, associateTitle, associateAmount, associateDate, remarkText, pagePath);
@@ -1678,20 +1678,20 @@ public class ReceiptServiceImpl implements ReceiptService {
 
         // 审核未通过 推送模板消息给指定人员
         if (4 == receiptStatus) {
-            log.info("【线下收款】>>>>>>>>审核未通过，请重新确认审核！收款Id：" + receipt.getId());
+            log.info("【线下收款】>>>>>>>>审核未通过，请重新确认审核！收款Id：" + receiptPo.getId());
             try {
                 String accessToken = weChatService.getAccessToken();
                 // 审核未通过
                 String title = "审核未通过，请重新确认审核！";
-                String date = receipt.getReceiptDate();
-                String receiptTypeStr = receiptMapper.getReceiptTypeStrById(receipt.getPayType());
+                String date = receiptPo.getReceiptDate();
+                String receiptTypeStr = receiptMapper.getReceiptTypeStrById(receiptPo.getPayType());
                 String remarkText = "收款类型："+ receiptTypeStr +"；"+"审核时间："+receiptPo.getReviewDate();
-                double associateAmount = receiptMapper.countAssociateAmountById(receipt.getId());
+                double associateAmount = receiptMapper.countAssociateAmountById(receiptPo.getId());
                 // （用户权限: 1收款列表访问，2收款详情分享，3收款录入，4收款关联订单，5收款关联返佣，6收款关联供应商退款，7收款审核）
                 List<String> openidList = receiptMapper.getOpenidListByPermission(Collections.singletonList(4));
                 openidList.removeIf(Objects::isNull);
                 // 跳转到【普通款项待审核】页面
-                String pagePath = "pages/relation/ordinary/examine-detail?id="+receipt.getId();
+                String pagePath = "pages/login/login-share?id="+receiptPo.getId();
                 for (String openid : openidList) {
                     // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
                     weChatService.sendTemplateMsg(accessToken, openid, title, associateAmount, date, remarkText, pagePath);
@@ -1719,22 +1719,8 @@ public class ReceiptServiceImpl implements ReceiptService {
         List<String> openidList = receiptMapper.getOpenidListByPermission(Arrays.asList(4,5,6));
         openidList.removeIf(Objects::isNull);
         String title = "超时未确认，请及时查看详情并确认关联！";
-        String pagePath = "";
         for (ReceiptVo receipt : list) {
-            // 收款款项类型：1订单款，2非订单款，3返佣款，5供应商退款
-            Integer receiptType = receipt.getReceiptType();
-            if (null != receiptType && 1 == receiptType) {
-                // 未关联普通款项
-                pagePath = "pages/relation/ordinary/index?id="+receipt.getId();
-            }
-            if (null != receiptType && 3 == receiptType) {
-                // 未关联返佣款项
-                pagePath = "pages/relation/return/index?id="+receipt.getId();
-            }
-            if (null != receiptType && 5 == receiptType) {
-                // 未关联供应商退款
-                pagePath = "pages/relation/refund/index?id="+receipt.getId();
-            }
+            String pagePath = "pages/login/login-share?id="+receipt.getId();
             double amount = receipt.getReceiptAmount();
             String date = receipt.getReceiptDate();
             String receiptTypeStr = receiptMapper.getReceiptTypeStrById(receipt.getPayType());
@@ -1768,7 +1754,7 @@ public class ReceiptServiceImpl implements ReceiptService {
             String receiptTypeStr = receiptMapper.getReceiptTypeStrById(receipt.getPayType());
             String remarkText = "收款类型：" + receiptTypeStr + "，确认时间："+receipt.getConfirmDate();
             // 跳转到【普通款项待审核】页面
-            String pagePath = "pages/relation/ordinary/examine-detail?id="+receipt.getId();
+            String pagePath = "pages/login/login-share?id="+receipt.getId();
             for (String openid : openidList) {
                 // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
                 weChatService.sendTemplateMsg(accessToken, openid, title, amount, date, remarkText, pagePath);