From 0a7770bdf093d51eeda0398c642e02e36855e952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Wed, 20 Oct 2021 15:26:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41057?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/common/enums/CompanyMessageEnums.java   |  2 +-
 .../service/impl/PayIncomeContractServiceImpl.java   |  6 +++---
 .../service/impl/PaySpendingContractServiceImpl.java | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java
index 16d99fa3..e2f5c8bb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java
@@ -12,7 +12,7 @@ import org.apache.commons.lang3.StringUtils;
  */
 public enum CompanyMessageEnums {
 
-    MSG1("QY_1_HYTZ_WORK_GROUP_CREATE","会议通知","meetingName,busId"),//点击跳转到报名页面，meetingName，busId
+    MSG1("QY_1_HYTZ_WORK_GROUP_CREATE","会议通知","meetingName"),//点击跳转到报名页面，meetingName
     MSG2("QY_2_HYTZ_WORK_GROUP_SIGN_UP","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName
     MSG3("QY_3_HYTZ_WORK_GROUP_UPLOAD","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName
     MSG4("QY_4_HYTZ_WORK_GROUP_NOT_UPLOAD","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName
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 35b77973..e79bb8bd 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
@@ -139,7 +139,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         }
         if(!Objects.isNull(payIncomeContract.getAccountsReceivableAmount()) && !Objects.isNull(payIncomeContract.getAmountReceived())
                 && payIncomeContract.getAccountsReceivableAmount().compareTo(payIncomeContract.getAmountReceived()) < 0){
-            throw new JeroBootException("应收金额大于已收金额！");
+            throw new JeroBootException("已收金额大于应收金额！");
         }
         StringBuilder msgPayIncomeContract = ValidUtil.validateAll(payIncomeContract);
         if(!StringUtils.isBlank(msgPayIncomeContract)){
@@ -214,7 +214,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                 }
                 if(!Objects.isNull(p.getAccountsReceivableAmount()) && !Objects.isNull(p.getPaidAmount())
                         && p.getAccountsReceivableAmount().compareTo(p.getPaidAmount()) < 0){
-                    msgPayIncomeContractInstallment.append("第").append(listPayIncomeContractInstallment.indexOf(p)  + 1).append("期应收金额大于已收金额！");
+                    msgPayIncomeContractInstallment.append("第").append(listPayIncomeContractInstallment.indexOf(p)  + 1).append("期实收金额大于应收金额！");
                 }
             });
             if(!StringUtils.isBlank(msgPayIncomeContractInstallment)){
@@ -236,7 +236,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         }
         if(!Objects.isNull(payIncomeContract.getAccountsReceivableAmount()) && !Objects.isNull(payIncomeContract.getAmountReceived())
                 && payIncomeContract.getAccountsReceivableAmount().compareTo(payIncomeContract.getAmountReceived()) < 0){
-            throw new JeroBootException("应收金额大于已收金额！");
+            throw new JeroBootException("已收金额大于应收金额！");
         }
         StringBuilder msgPayIncomeContract = ValidUtil.validateAll(payIncomeContract);
         if(!StringUtils.isBlank(msgPayIncomeContract)){
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 fcab462b..dc4f1c45 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
@@ -83,7 +83,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         }
         if(!Objects.isNull(paySpendingContract.getAccountsReceivableAmount()) && !Objects.isNull(paySpendingContract.getAmountReceived())
                 && paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) < 0){
-            throw new JeroBootException("应收金额大于已收金额！");
+            throw new JeroBootException("已收金额大于应收金额！");
         }
         StringBuilder msgPayIncomeContract = ValidUtil.validateAll(paySpendingContract);
         if(!StringUtils.isBlank(msgPayIncomeContract)){
@@ -123,7 +123,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
                 }
                 if(!Objects.isNull(p.getAccountsReceivableAmount()) && !Objects.isNull(p.getPaidAmount())
                         && p.getAccountsReceivableAmount().compareTo(p.getPaidAmount()) < 0){
-                    msgPaySpendingContractInstallment.append("第").append(finalListPaySpendingContractInstallment.indexOf(p)  + 1).append("期应收金额大于已收金额！");
+                    msgPaySpendingContractInstallment.append("第").append(finalListPaySpendingContractInstallment.indexOf(p)  + 1).append("期实收金额大于应收金额！");
                 }
             });
             paySpendingContractInstallmentService.saveBatch(listPaySpendingContractInstallment);
@@ -146,7 +146,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         }
         if(!Objects.isNull(paySpendingContract.getAccountsReceivableAmount()) && !Objects.isNull(paySpendingContract.getAmountReceived())
                 && paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) < 0){
-            throw new JeroBootException("应收金额大于已收金额！");
+            throw new JeroBootException("已收金额大于应收金额！");
         }
         StringBuilder msgPayIncomeContract = ValidUtil.validateAll(paySpendingContract);
         if(!StringUtils.isBlank(msgPayIncomeContract)){
@@ -201,7 +201,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
                 }
                 if(!Objects.isNull(p.getAccountsReceivableAmount()) && !Objects.isNull(p.getPaidAmount())
                         && p.getAccountsReceivableAmount().compareTo(p.getPaidAmount()) < 0){
-                    msgPaySpendingContractInstallment.append("第").append(finalListPaySpendingContractInstallment.indexOf(p)  + 1).append("期应收金额大于已收金额！");
+                    msgPaySpendingContractInstallment.append("第").append(finalListPaySpendingContractInstallment.indexOf(p)  + 1).append("期实收金额大于应收金额！");
                 }
             });
             paySpendingContractInstallmentService.saveBatch(listPaySpendingContractInstallment);
@@ -458,7 +458,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
                         }
                         if(!Objects.isNull(paySpendingContract.getAccountsReceivableAmount()) && !Objects.isNull(paySpendingContract.getAmountReceived())
                                 && paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) < 0){
-                            sb.append("第").append(n + 1).append("行，应收金额大于已收金额，请修改！<br/>");
+                            sb.append("第").append(n + 1).append("行，已收金额大于应收金额，请修改！<br/>");
                         }
                         List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();
                         if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
@@ -466,7 +466,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
                                 int c = listPaySpendingContractInstallment.indexOf(item) + 1;
                                 if(!Objects.isNull(item.getAccountsReceivableAmount()) && !Objects.isNull(item.getPaidAmount())
                                         && item.getAccountsReceivableAmount().compareTo(item.getPaidAmount()) < 0){
-                                    sb.append("第").append(n + 1).append("行，").append(c).append("期应收金额大于已收金额，请修改！<br/>");
+                                    sb.append("第").append(n + 1).append("行，").append(c).append("期实收金额大于应收金额，请修改！<br/>");
                                 }
                                 StringBuilder msg = ValidUtil.validateExcel(item,n + 1);
                                 if(!StringUtils.isBlank(msg)){