From 932ec53891a8b2e6b019465b9521a46ecb94902d Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Thu, 16 Dec 2021 11:32:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayPaymentCheckController.java |  3 +--
 .../impl/PayPaymentCheckServiceImpl.java      | 24 +++++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java
index 32aaf0e4..e33f329c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java
@@ -32,11 +32,10 @@ public class PayPaymentCheckController extends JeroController<PayPaymentRecordSu
      * @return
      */
     @ApiOperation(value="来款列表", notes="来款列表")
-    @PostMapping(value = "/amountReceivedList")
+    @GetMapping(value = "/amountReceivedList")
     public Result<?> amountReceivedList(String id) {
         LambdaQueryWrapper<PayPaymentRecord> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PayPaymentRecord::getProjectId, id);
-        wrapper.eq(PayPaymentRecord::getPaymentStatus, PaymentStatusEnum.COMPLETED.getCode());
         wrapper.orderByAsc(PayPaymentRecord::getPaymentDate);
         List<PayPaymentRecord> list = payPaymentRecordService.list(wrapper);
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
index c9ecae96..5b445a18 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
@@ -151,22 +151,20 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
      */
     @Override
     public void check(PayPaymentRecord payPaymentRecord){
+        //更新来款记录主表
+        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+        payPaymentRecord.setReviewerId(sysUser.getId());
+        payPaymentRecord.setReviewerName(sysUser.getRealname());
+
+        payPaymentRecordMapper.updateById(payPaymentRecord);
+        //新增来款记录表子表
+        PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
+        payPaymentRecordSub.setRecordId(payPaymentRecord.getId());
+        BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
+        payPaymentCheckMapper.insert(payPaymentRecordSub);
 
         //拒绝
         if(PaymentStatusEnum.REJECTED.getCode().equals(payPaymentRecord.getPaymentStatus())){
-            LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-            payPaymentRecord.setReviewerId(sysUser.getId());
-            payPaymentRecord.setReviewerName(sysUser.getRealname());
-
-            //更新来款记录主表
-            payPaymentRecordMapper.updateById(payPaymentRecord);
-
-            //新增来款记录表子表
-            PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
-            payPaymentRecordSub.setRecordId(payPaymentRecord.getId());
-            BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
-            payPaymentCheckMapper.insert(payPaymentRecordSub);
-
             return;
         }