From 028608d787024ee3a148a0bee8143ec48437d042 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 12 Oct 2022 09:15:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=90=88=E5=90=8C=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayIncomeContractServiceImpl.java     |  5 ++++-
 .../service/impl/PaySpendingContractServiceImpl.java   |  7 +++++--
 .../mail/controller/PayMailContractController.java     | 10 ++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
index 0dc38927..1906bde9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
@@ -833,6 +833,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                 JSONObject json = new JSONObject();
                 json.put("revenueId",payIncomeContractNew.getId());
                 json.put("contractNum",payIncomeContractNew.getContractNum());
+                json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE2);
                 sendMessageDTO.setBusId(json.toJSONString());
                 sendMessageService.SendMessageService(sendMessageDTO);
             });
@@ -984,6 +985,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                     JSONObject json = new JSONObject();
                     json.put("revenueId",payIncomeContractStatus.getId());
                     json.put("contractNum",payIncomeContractStatus.getContractNum());
+                    json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE2);
                     sendMessageDTO.setBusId(json.toJSONString());
                     sendMessageService.SendMessageService(sendMessageDTO);
                 });
@@ -1012,6 +1014,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                 JSONObject json = new JSONObject();
                 json.put("revenueId",payIncomeContractStatus.getId());
                 json.put("contractNum",payIncomeContractStatus.getContractNum());
+                json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE2);
                 sendMessageDTO.setBusId(json.toJSONString());
                 sendMessageService.SendMessageService(sendMessageDTO);
             }
@@ -1080,7 +1083,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
             JSONObject json = new JSONObject();
             json.put("revenueId",payIncomeContractStatus.getId());
             json.put("contractNum",payIncomeContractStatus.getContractNum());
-            json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE);
+            json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE2);
             sendMessageDTO.setBusId(json.toJSONString());
             sendMessageService.SendMessageService(sendMessageDTO);
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
index 83586600..8a6c7d60 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
@@ -190,6 +190,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
                 JSONObject json = new JSONObject();
                 json.put("revenueId",paySpendingContract.getId());
                 json.put("contractNum",paySpendingContract.getContractNum());
+                json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE1);
                 sendMessageDTO.setBusId(json.toJSONString());
                 sendMessageService.SendMessageService(sendMessageDTO);
             });
@@ -216,6 +217,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
             JSONObject json = new JSONObject();
             json.put("revenueId",paySpendingContract.getId());
             json.put("contractNum",paySpendingContract.getContractNum());
+            json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE1);
             sendMessageDTO.setBusId(json.toJSONString());
             sendMessageService.SendMessageService(sendMessageDTO);
         }
@@ -688,7 +690,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
                     JSONObject json = new JSONObject();
                     json.put("revenueId",paySpendingContractStatus.getId());
                     json.put("contractNum",paySpendingContractStatus.getContractNum());
-                    json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE);
+                    json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE1);
                     sendMessageDTO.setBusId(json.toJSONString());
                     sendMessageService.SendMessageService(sendMessageDTO);
                 });
@@ -717,7 +719,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
                 JSONObject json = new JSONObject();
                 json.put("revenueId",paySpendingContractStatus.getId());
                 json.put("contractNum",paySpendingContractStatus.getContractNum());
-                json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE);
+                json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE1);
                 sendMessageDTO.setBusId(json.toJSONString());
                 sendMessageService.SendMessageService(sendMessageDTO);
             }
@@ -765,6 +767,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
             JSONObject json = new JSONObject();
             json.put("revenueId",paySpendingContractStatus.getId());
             json.put("contractNum",paySpendingContractStatus.getContractNum());
+            json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE1);
             sendMessageDTO.setBusId(json.toJSONString());
             sendMessageService.SendMessageService(sendMessageDTO);
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
index 9b530847..2e216bfe 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
@@ -155,7 +155,10 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 				sendMessageDTO.setTemplateParam(map);
 				sendMessageDTO.setBusType("M_OPEN_TYPE14");
 				JSONObject json = new JSONObject();
-				json.put("id", payIncomeContract.getId());
+				//json.put("id", payIncomeContract.getId());
+				json.put("revenueId",payIncomeContract.getId());
+				json.put("contractNum",payIncomeContract.getContractNum());
+				json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE2);
 				sendMessageDTO.setBusId(json.toJSONString());
 				sendMessageService.SendMessageService(sendMessageDTO);
 
@@ -226,7 +229,10 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 				 sendMessageDTO.setTemplateParam(map);
 				 sendMessageDTO.setBusType("M_OPEN_TYPE14");
 				 JSONObject json = new JSONObject();
-				 json.put("id", payIncomeContract.getId());
+				 //json.put("id", payIncomeContract.getId());
+				 json.put("revenueId",payIncomeContract.getId());
+				 json.put("contractNum",payIncomeContract.getContractNum());
+				 json.put("contractType",PayIncomeContractCommon.CONTRACT_TYPE2);
 				 sendMessageDTO.setBusId(json.toJSONString());
 				 sendMessageService.SendMessageService(sendMessageDTO);