LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 合同通知跳转异常

Browse Source
This commit is contained in:
lijiarao
2022-10-12 09:15:53 +08:00
parent 9d5986593e
commit 028608d787
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+4 -1
View File
@@ -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);
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+5 -2
View File
@@ -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);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+8 -2
View File
@@ -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);