From 55055cfdf8d6a032f7f77861f747295d52e3058b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 29 Mar 2024 16:12:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=2081955=20=E7=AE=A1=E7=90=86=E7=AB=AF?=
 =?UTF-8?q?=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8=E4=B8=AD=20=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E6=9D=A5=E6=AC=BE=E4=BF=A1=E6=81=AF=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF-=E5=88=B0=E8=B4=A6=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=95=B0=E6=8D=AE=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayPaymentCheckController.java |  4 +--
 .../jero/payment/entity/PayPaymentRecord.java |  4 +++
 .../service/IPayPaymentCheckService.java      |  4 +--
 .../impl/PayPaymentCheckServiceImpl.java      | 31 +++++++++++++------
 4 files changed, 30 insertions(+), 13 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 48911421..d6ac0df4 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
@@ -88,9 +88,9 @@ public class PayPaymentCheckController extends JeroController<PayPaymentRecordSu
 
    @ApiOperation(value="编辑", notes="编辑")
    @PostMapping(value = "/edit")
-   public Result<?> edit(@RequestBody PayPaymentRecord payPaymentRecord) {
+   public Result<?> edit(@RequestBody PayPaymentRecordSub paymentRecordSub) {
        try{
-           payPaymentCheckService.edit(payPaymentRecord);
+           payPaymentCheckService.edit(paymentRecordSub);
        }catch (Exception e){
            log.error("编辑异常",e);
            return Result.error(e.getMessage());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java
index 6ff71527..dc62ea7b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java
@@ -166,4 +166,8 @@ public class PayPaymentRecord implements Serializable {
     @ApiModelProperty(value = "联行号")
     @TableField(exist = false)
     private String linkBankNumber;
+    /**recordId*/
+    @ApiModelProperty(value = "recordId")
+    @TableField(exist = false)
+    private String recordId;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java
index 1e7352e2..17889bd2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java
@@ -36,9 +36,9 @@ public interface IPayPaymentCheckService extends IService<PayPaymentRecordSub> {
 
     /**
      *  编辑
-     * @param payPaymentRecord
+     * @param paymentRecordSub
      */
-    void edit(PayPaymentRecord payPaymentRecord);
+    void edit(PayPaymentRecordSub paymentRecordSub);
 
     /**
      * 审核
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 2956ad02..e6c5b4a3 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
@@ -3,6 +3,7 @@ package com.jero.payment.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.common.RoleCommon;
@@ -291,6 +292,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         payPaymentRecordSub.setLastSign(LastSignEnum.LAST.getCode());
         payPaymentRecordSub.setDelFlag(PayProjectCommon.NO);
         payPaymentCheckMapper.insert(payPaymentRecordSub);
+        payPaymentRecordSub.setRecordId(payPaymentRecordSub.getId());
+        payPaymentCheckMapper.updateById(payPaymentRecordSub);
 
         //发消息
         uploadSendMessage(principalId,payPaymentRecord.getProjectId(), project,String.valueOf(payPaymentRecord.getProjectType()));
@@ -313,16 +316,18 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
     /**
      *  编辑
-     * @param payPaymentRecord
+     * @param paymentRecordSub
      */
     @Override
-    public void edit(PayPaymentRecord payPaymentRecord){
-        if(!PaymentStatusEnum.REJECTED.getCode().equals(payPaymentRecord.getPaymentStatus())){
+    public void edit(PayPaymentRecordSub paymentRecordSub){
+        if(!PaymentStatusEnum.REJECTED.getCode().equals(paymentRecordSub.getPaymentStatus())){
             throw new JeroBootException("只有拒绝的才可编辑");
         }
 
         String principalId="";
         String project="";
+        PayPaymentRecord payPaymentRecord = new PayPaymentRecord();
+        BeanUtils.copyProperties(paymentRecordSub, payPaymentRecord);
         switch (String.valueOf(payPaymentRecord.getProjectType())){
             // 普通项目
             case PayIncomeContractCommon.PROJECT_TYPE1:
@@ -395,15 +400,16 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
         //新增子表
         LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-        payPaymentRecord.setApplicantName(sysUser.getRealname());
-        payPaymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
-        payPaymentRecord.setCreateBy(sysUser.getUsername());
-        payPaymentRecord.setCreateTime(new Date());
+
         PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
-        BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
+        BeanUtils.copyProperties(paymentRecordSub, payPaymentRecordSub);
         payPaymentRecordSub.setId(null);
         payPaymentRecordSub.setLastSign(LastSignEnum.LAST.getCode());
         payPaymentRecordSub.setDelFlag(PayProjectCommon.NO);
+        payPaymentRecordSub.setApplicantName(sysUser.getRealname());
+        payPaymentRecordSub.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
+        payPaymentRecordSub.setCreateBy(sysUser.getUsername());
+        payPaymentRecordSub.setCreateTime(new Date());
         payPaymentCheckMapper.insert(payPaymentRecordSub);
 
         //将之前的那条置为OLD
@@ -716,8 +722,15 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
             sub.setReviewerName(payPaymentRecord.getReviewerName());
             sub.setReviewTime(payPaymentRecord.getReviewTime());
             sub.setReviewInstructions(payPaymentRecord.getReviewInstructions());
-            sub.setRecordId(payPaymentRecord.getId());
+            //sub.setRecordId(payPaymentRecord.getId());
             payPaymentCheckMapper.updateById(sub);
+
+            if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
+                LambdaUpdateWrapper<PayPaymentRecordSub> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.set(PayPaymentRecordSub::getRecordId,payPaymentRecord.getId());
+                updateWrapper.eq(PayPaymentRecordSub::getRecordId,payPaymentRecord.getRecordId());
+                this.update(updateWrapper);
+            }
         }
 
     }