From 0f42e4c14f805a95fbfdbce14113dd8dd7388479 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 23 Sep 2021 14:52:09 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E4=BA=8C=E7=BB=B4=E7=A0=81=EF=BC=8C=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=AD=A3=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingSituationServiceImpl.java      | 2 +-
 .../java/com/jero/meeting/vo/PayMeetingSituationVO.java   | 4 ++++
 .../src/main/java/com/jero/meeting/vo/PayMeetingVO.java   | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 363a8c6c..17b0d767 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -498,7 +498,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());
                 String paymentRecord = payMeetingSituation.getPaymentRecord();
                 payMeetingSituation1.setPaymentRecord(paymentRecord);
-                StringUtils.isBlank(paymentRecord);
+                payMeetingSituation1.setOrderCode(payMeetingSituation.getOrderCode());
                 //如果是标协会议判断会员类型
                 if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
                     //根据企业名称和会员类型不为null判断是否为标协会员
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java
index 2282693a..cd7b32a6 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java
@@ -287,4 +287,8 @@ public class PayMeetingSituationVO {
     @ApiModelProperty(value = "打包")
     private Integer pack;
 
+    /**订单后4位编码*/
+    @ApiModelProperty(value = "订单后4位编码")
+    private String orderCode;
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
index b57c7322..052acf85 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
@@ -255,4 +255,12 @@ public class PayMeetingVO implements Serializable {
     /**是否提醒*/
     @ApiModelProperty(value = "是否提醒")
     private Integer remind;
+
+    /**收款二维码*/
+    @ApiModelProperty(value = "收款二维码")
+    private String paymentQrCode;
+
+    /**通知正文*/
+    @ApiModelProperty(value = "通知正文")
+    private String notice;
 }