From ec1bf5b9cea7cdebe018eafb8ec404ac79437687 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sun, 26 Sep 2021 20:30:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=8F=AA=E8=83=BD=E4=B8=80=E6=AC=A1=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E6=94=B6?=
 =?UTF-8?q?=E8=B4=B9=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/mail/service/impl/PayMailBillServiceImpl.java   | 5 +++--
 .../com/jero/meeting/service/impl/PayMeetingServiceImpl.java | 1 +
 .../service/impl/StableCrossTrainingServiceImpl.java         | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
index a9c69a63..6e473b46 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
@@ -204,6 +204,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         BillingInfo billingInfo = new BillingInfo();
         billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
         billingInfo.setMemberId(tbMemberProjectSubitem.getMemberId());
+        billingInfo.setMobile(tbMemberProjectSubitem.getMobile());
         billingInfo.setBillNo(payMailBill.getBillNo());
         billingInfo.setSendMethod(payMailBill.getSendMethod());
         billingInfo.setSendDate(payMailBill.getSendDate());
@@ -372,8 +373,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     //之前开票总额+本次开票金额
                     invoiceAmount = oldInvoiceAmount.add(bmpList.get(i).getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
                     //开票总额>应收
-                    if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) == 1){
-                        return "开票金额大于当前欠未开票金额，输入有误！";
+                    if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) != 0){
+                        return "开票金额应等于当前未开票金额，输入有误！";
                     }
                     break;
                 default:
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index d0cd5dc8..75d3aac1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -106,6 +106,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 			);
 			meetingHotelContactsService.saveBatch(hotelContactsList);
 		}
+		//新增会员系统标协会议
 		if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
 			stableCrossTrainingService.add(payMeeting,hotelContactsList);
 		}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
index 370848f5..7bb6f0b3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
@@ -233,6 +233,7 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
                 .set(StringUtils.isNotBlank(stableCrossTraining.getMeetingApply()), StableCrossTraining::getMeetingApply, stableCrossTraining.getMeetingApply())//会议报名：校验网址格式
                 .set(StableCrossTraining::getMeetingFiles, stableCrossTraining.getMeetingFiles())//会议文件
                 .set(StableCrossTraining::getMeetingNotifyFiles, stableCrossTraining.getMeetingNotifyFiles())//会议通知文件
+                .set(StableCrossTraining::getPaymentQrCode, stableCrossTraining.getPaymentQrCode())//付款二维码
                 .set(StringUtils.isNotBlank(stableCrossTraining.getMeetingDescription()), StableCrossTraining::getMeetingDescription, stableCrossTraining.getMeetingDescription())//会议简介
                 .set(StringUtils.isNotBlank(stableCrossTraining.getRemark()), StableCrossTraining::getRemark, stableCrossTraining.getRemark())//备注
                 .set(StringUtils.isNotBlank(stableCrossTraining.getQrCode()), StableCrossTraining::getQrCode, stableCrossTraining.getQrCode())//二维码