From bfdc1a3d5942a2ca256d69649ce4bad46d6e2b38 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 27 Sep 2021 13:49:27 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=B8=80=E4=BA=9B=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayMeetingSituationController.java        | 20 ++-----------------
 .../meeting/entity/PayMeetingSituation.java   |  6 ++++++
 .../impl/PayMeetingSituationServiceImpl.java  | 18 ++++++++++++++++-
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
index c1c806b5..30f3b87d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
@@ -104,9 +104,9 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
     }
 
     /**
-     * 分页列表查询
+     * 分页列表查询 会员系统系统
      */
-    @ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询")
+    @ApiOperation(value = "参会人员信息-分页列表查询 会员系统系统", notes = "参会人员信息-分页列表查询")
     @GetMapping(value = "/page2")
     public Result<?> queryPageList2(PayMeetingSituation payMeetingSituation,
                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -121,22 +121,6 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
         return Result.OK(pageList);
     }
 
-    /**
-     * 分页列表查询
-     */
-    /*@ApiOperation(value = "报名信息-分页列表查询", notes = "报名信息-分页列表查询")
-    @GetMapping(value = "/signUpPage")
-    public Result<?> signUpPage(PayMeetingSituation payMeetingSituation,
-                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                HttpServletRequest req) {
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
-        queryWrapper.ne("status", MeetingSubitemCommon.STATUS_3);
-        Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize);
-        IPage<PayMeetingSituation> pageList = payMeetingSituationService.page(page, queryWrapper);
-        return Result.OK(pageList);
-    }*/
-
     /**
      * 列表查询
      */
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 15ad7489..4aa7ece6 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
@@ -396,4 +396,10 @@ public class PayMeetingSituation implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "收入合同处新增标识 flag = 1")
     private String flag;
+    /**
+     * 收入合同id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "收入合同id")
+    private String contractId;
 }
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 a291984f..2c6a811c 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
@@ -117,9 +117,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         payMeetingSituation.setStatus(MeetingSubitemCommon.STATUS_3);
         payMeetingSituation.setNeedInvoice(PayProjectCommon.NO);
         payMeetingSituation.setAmountReceivable(new BigDecimal("0"));
+        //处理校验参会人信息
         PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
 
         saveMeetingSituation(payMeetingSituation1);
+        //处理打包情况
         handlePack(payMeetingSituation1);
 
 
@@ -130,9 +132,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         }
         String meetingId = payMeetingSituation1.getMeetingId();
         PayMeeting payMeeting = meetingService.getById(meetingId);
+        //上传付款凭证发送邮件提醒审批
         SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
     }
 
+    /**
+     * 上传付款凭证发送邮件提醒审批
+     * @param payMeetingSituation
+     * @param payMeeting
+     */
     private void SendPaymentRecordMessage(PayMeetingSituation payMeetingSituation, PayMeeting payMeeting) {
         String paymentRecord = payMeetingSituation.getPaymentRecord();
         //上传付款凭证发送邮件提醒审批
@@ -226,6 +234,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             }
             payMeetingSituation.setIdentity(MeetingSubitemCommon.JIA_BIN);
         }
+        //处理校验参会人信息
         PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
         saveMeetingSituation(payMeetingSituation1);
         //处理打包
@@ -251,6 +260,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
             }
         }
+        //上传付款凭证发送邮件提醒审批
         SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
     }
 
@@ -537,6 +547,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             throw new JeroBootException("参会人错误!");
         }
         BeanUtils.copyProperties(payMeetingSituationVO, payMeetingSituation);
+        //处理校验参会人信息
         PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
         //判断是否修改付款凭证
         Integer checkResult = oldObject.getCheckResult();
@@ -581,6 +592,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         saveOrUpdate(payMeetingSituation1);
     }
 
+    /**
+     * 处理校验参会人信息
+     * @param payMeetingSituation
+     * @return
+     */
     @NotNull
     private PayMeetingSituation getPayMeetingSituation(PayMeetingSituation payMeetingSituation) {
         String meetingId = payMeetingSituation.getMeetingId();
@@ -656,7 +672,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 }
             }
             BeanUtils.copyProperties(internationalGuestVO, payMeetingSituation1);
-            //参会人
+        //    参会人
         } else if (identity.equals(MeetingSubitemCommon.CAN_HUI_REN)) {
             CommonPeopleVO commonPeopleVO = new CommonPeopleVO();
             BeanUtils.copyProperties(payMeetingSituation, commonPeopleVO);