收款项和订单关系bugfix

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

@@ -36,8 +36,6 @@ public class WeChatService {
     private String appId;
     @Value("${wx.app-secret}")
     private String appSecret;
-    @Value("${wx.message-template-id}")
-    private String messageTemplateId;
     @Value("${wx.mini-app-id}")
     private String miniAppId;
     @Value("${wx.mini-app-secret}")
@@ -54,94 +52,12 @@ public class WeChatService {
     private String heHeAppId;
     @Value("${wx.hehe-app-secret}")
     private String heHeAppSecret;
+    /**
+     * 收款通知模板Id
+     */
+    @Value("${wx.message-template.receipt}")
+    private String messageTemplateReceipt;
 
-    public void setRedirectUri(String redirectUri) {
-        redirectUri = redirectUri;
-    }
-
-    public void setAppId(String appId) {
-        appId = appId;
-    }
-
-    public void setAppSecret(String appSecret) {
-        appSecret = appSecret;
-    }
-
-    public void setMiniAppId(String miniAppId) {
-        miniAppId = miniAppId;
-    }
-
-    public void setMiniAppSecret(String miniAppSecret) {
-        miniAppSecret = miniAppSecret;
-    }
-
-    public String getReceiptAppId() {
-        return receiptAppId;
-    }
-
-    public void setReceiptAppId(String receiptAppId) {
-        this.receiptAppId = receiptAppId;
-    }
-
-    public String getReceiptAppSecret() {
-        return receiptAppSecret;
-    }
-
-    public void setReceiptAppSecret(String receiptAppSecret) {
-        this.receiptAppSecret = receiptAppSecret;
-    }
-
-    public String getHeHeAppId() {
-        return heHeAppId;
-    }
-
-    public void setHeHeAppId(String heHeAppId) {
-        this.heHeAppId = heHeAppId;
-    }
-
-    public String getHeHeAppSecret() {
-        return heHeAppSecret;
-    }
-
-    public void setHeHeAppSecret(String heHeAppSecret) {
-        this.heHeAppSecret = heHeAppSecret;
-    }
-
-    public void setCrmAppId(String crmAppId) {
-        crmAppId = crmAppId;
-    }
-
-    public void setCrmAppSecret(String crmAppSecret) {
-        crmAppSecret = crmAppSecret;
-    }
-
-    public String getRedirectUri() {
-        return redirectUri;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public String getAppSecret() {
-        return appSecret;
-    }
-
-    public String getMiniAppId() {
-        return miniAppId;
-    }
-
-    public String getMiniAppSecret() {
-        return miniAppSecret;
-    }
-
-    public String getCrmAppId() {
-        return crmAppId;
-    }
-
-    public String getCrmAppSecret() {
-        return crmAppSecret;
-    }
 
     public static class Keys {
         public static final String OPEN_ID = "openid";
@@ -380,7 +296,7 @@ public class WeChatService {
         miniProgram.put("pagepath", pagePath);
 
         JSONObject json = new JSONObject();
-        json.put("template_id", messageTemplateId);
+        json.put("template_id", messageTemplateReceipt);
         json.put("topcolor", "#FF0000");
         json.put("touser", openid);
         json.put("url", "https://www.caimei365.com/");

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

@@ -262,6 +262,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                         }
                         // 收款项和订单关系表
                         OrderReceiptRelationPo relation = new OrderReceiptRelationPo();
+                        relation.setDelFlag(0);
                         relation.setRelationType(2);
                         relation.setAssociationType(2);
                         // 记录原始应付金额
@@ -939,6 +940,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 if (orderIDS.length == 1) {
                     // 收款项和订单关系表
                     OrderReceiptRelationPo relation = new OrderReceiptRelationPo();
+                    relation.setDelFlag(0);
                     relation.setRelationType(2);
                     relation.setAssociationType(1);
                     // 订单信息
@@ -1000,6 +1002,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                         for (OrderVo order : list) {
                             if (amount > 0) {
                                 OrderReceiptRelationPo relation = new OrderReceiptRelationPo();
+                                relation.setDelFlag(0);
                                 relation.setRelationType(2);
                                 if (amount >= order.getPayableAmount()) {
                                     relation.setReceiptId(receiptPo.getId());
@@ -1019,6 +1022,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                         //小额抹平确认
                         for (OrderVo order : list) {
                             OrderReceiptRelationPo relation = new OrderReceiptRelationPo();
+                            relation.setDelFlag(0);
                             relation.setRelationType(2);
                             if (amount >= order.getPayableAmount()) {
                                 relation.setReceiptId(receiptPo.getId());
@@ -1037,6 +1041,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                         //大额抹平确认
                         for (OrderVo order : list) {
                             OrderReceiptRelationPo relation = new OrderReceiptRelationPo();
+                            relation.setDelFlag(0);
                             relation.setRelationType(2);
                             if (amount >= order.getPayableAmount()) {
                                 relation.setReceiptId(receiptPo.getId());
@@ -1056,6 +1061,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                         //大额退款余额
                         for (OrderVo order : list) {
                             OrderReceiptRelationPo relation = new OrderReceiptRelationPo();
+                            relation.setDelFlag(0);
                             relation.setRelationType(2);
                             if (amount >= order.getPayableAmount()) {
                                 relation.setReceiptId(receiptPo.getId());
@@ -1147,11 +1153,11 @@ public class ReceiptServiceImpl implements ReceiptService {
         receiptMapper.updateReceipt(receiptPo);
         // 保存 收款项和订单关系
         OrderReceiptRelationPo relation = new OrderReceiptRelationPo();
+        relation.setDelFlag(0);
         relation.setOrderId(receiptOperateDto.getShopOrderId());
         relation.setReceiptId(receipt.getId());
         relation.setRelationType(1);
         relation.setAssociateAmount(receipt.getReceiptAmount());
-        relation.setDelFlag(0);
         baseMapper.insertOrderReceiptRelation(relation);
         /*
          * 保存供应商退款
@@ -1308,6 +1314,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         for (String shopOrderId : shopOrderIdArr) {
             // 保存 收款项和订单关系
             OrderReceiptRelationPo relation = new OrderReceiptRelationPo();
+            relation.setDelFlag(0);
             relation.setOrderId(Integer.valueOf(shopOrderId));
             relation.setReceiptId(receiptId);
             relation.setRelationType(1);

src/main/resources/mapper/ReceiptMapper.xml

@@ -239,6 +239,7 @@
             cdr.handlingFee,
             cdr.orderFlag,
             cdr.noOrderReason,
+            cdr.reviewReason,
             IFNULL((
                 SELECT SUM(b.associateAmount) FROM cm_receipt_order_relation b WHERE b.receiptID = cdr.id AND b.delFlag = '0'
             ), 0) AS associateAmount
@@ -261,6 +262,7 @@
             cdr.handlingFee,
             cdr.orderFlag,
             cdr.noOrderReason,
+            cdr.reviewReason,
             CASE WHEN cror.relationType = 2 THEN co.organizeID
                  WHEN cror.relationType = 1 THEN cso.organizeID
                  ELSE '' END AS organizeId,
@@ -330,6 +332,7 @@
         cdr.noOrderReason,
         cdr.cancelReason,
         cdr.confirmType,
+        cdr.reviewReason,
         receiptUserPermissionID AS receiptUserPermissionId,
         confirmUserPermissionID AS confirmUserPermissionId,
         reviewUserPermissionID AS reviewUserPermissionId,