From 82ca042c9b9dd0e2f7c592d2bd9425440ff06ea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Tue, 12 Oct 2021 17:46:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40334?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/impl/ProjectDetailServiceImpl.java     | 2 ++
 .../src/main/java/com/jero/common/vo/ProjectDetailVO.java | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
index 0013ce64..742e6113 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
@@ -107,6 +107,8 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
         projectDetailVO.setProjectType(payCommonProject.getProjectType());
         projectDetailVO.setChargeWay(payCommonProject.getChargeWay());
         projectDetailVO.setFiles(payCommonProject.getFiles());
+        projectDetailVO.setChargeNoticeNo(payCommonProject.getChargeNoticeNo());
+        projectDetailVO.setChargeNoticeId(payCommonProject.getChargeNoticeId());
         if(!Objects.isNull(payCommonProject.getChargeWay())){
             // 普通项目，工作组，会员
             if(Objects.equals(String.valueOf(payCommonProject.getProjectType()),ProjectCommon.PROJECT_TYPE1)
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
index 8402130b..56a3cd5b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
@@ -5,6 +5,8 @@ import com.jero.mail.entity.PayMailBill;
 import com.jero.payment.entity.PayPaymentRecord;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -135,6 +137,12 @@ public class ProjectDetailVO implements Serializable {
      */
     @ApiModelProperty(value = "到账信息")
     private List<PayPaymentRecord> paymentRecord;
+    /**收费通知号*/
+    @ApiModelProperty(value = "收费通知号")
+    private String chargeNoticeNo;
+    /**收费通知文件id*/
+    @ApiModelProperty(value = "收费通知文件id")
+    private String chargeNoticeId;
     /**
      * 开票邮寄记录
      */