From 3a30d4ea19672bac3284a8818099b5b83d8f391d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 14 Sep 2021 18:02:10 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=A5=E6=AC=BE=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/meeting/entity/PayMeetingSituation.java  |  9 ++++-----
 .../service/impl/PayMeetingSituationServiceImpl.java  | 11 ++++++++++-
 .../jero/member/entity/TbMemberProjectSubitem.java    |  7 +++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index 78678343..d072925e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -2,10 +2,8 @@ package com.jero.meeting.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.baomidou.mybatisplus.annotation.*;
 import com.jero.meeting.valid.group.CommonPeople;
 import com.jero.meeting.valid.group.Guest;
 import lombok.Data;
@@ -285,6 +283,7 @@ public class PayMeetingSituation implements Serializable {
 
 	/**付款凭证*/
     @ApiModelProperty(value = "付款凭证")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String paymentRecord;
 
 	/**状态（1未导入、2已导入、3参会人）*/
@@ -353,7 +352,7 @@ public class PayMeetingSituation implements Serializable {
     @Dict(dicCode = "signup_status")
     private Integer checkResult;
 
-    /**审核状态*/
+    /**审核备注*/
     @ApiModelProperty(value = "审核备注")
     @TableField(exist = false)
     private String checkRemark;
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 8abb59a7..07ae5479 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
@@ -145,7 +145,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     public void check(CheckVO checkVO) {
         String id = checkVO.getId();
         PayMeetingSituation meetingSituation = getById(id);
-
+        String paymentRecord = meetingSituation.getPaymentRecord();
+        if (StrUtil.isBlank(paymentRecord)){
+            throw new JeroBootException("来款凭证为空不能审核");
+        }
+        Integer checkResult1 = meetingSituation.getCheckResult();
+        if (checkResult1.equals(PayProjectCommon.YES)){
+            throw new JeroBootException("审核通过之后就无法在审核");
+        }
         Integer checkResult = checkVO.getCheckResult();
         if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
             //TODO 提示信息
@@ -268,6 +275,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
         //处理联系人
         canHuiContact(payMeetingSituation1, companyId, contactsManagement);
+        //处理付款凭证
+        payMeetingSituation1.setPaymentRecord(null);
         //存入打包字段
         payMeetingSituation1.setPack(PayProjectCommon.PACKAGING0);
         payMeetingSituation1.setNeedInvoice(PayProjectCommon.NO);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
index 4cfb5c92..b4cc9a8d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.common.util.PasswordUtil;
+import com.jero.meeting.valid.group.CommonPeople;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -19,6 +20,7 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -159,6 +161,11 @@ public class TbMemberProjectSubitem implements Serializable {
     @ApiModelProperty(value = "来款用途（字典表）")
     private String chargeUse;
 
+    /**缴费方式*/
+    @Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type")
+    @Dict(dicCode = "meeting_pay_type")
+    private Integer payMode;
+
     public String convertisEmail(){
         return PasswordUtil.decrypt(email);
     }