From e962899c7a9b4ba44cecf060ee34c4602b4eef16 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 15 May 2023 14:12:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationFeign.java            |  2 +-
 .../FinCollectionConfirmationFeignFallback.java    |  2 +-
 .../FinCollectionConfirmationRest.java             |  4 ++--
 .../FinCollectionConfirmationService.java          | 14 +++++++++-----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
index 50b1b71c0c..fe356b8054 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
@@ -88,7 +88,7 @@ public interface FinCollectionConfirmationFeign {
 
     @ApiOperation("收款申请撤回")
     @PostMapping("/recallConfirm")
-    ResultBean recallConfirm(@RequestParam("sid") String sid);
+    ResultBean recallConfirm(@RequestParam("sid") String sid,@RequestParam("userSid")String userSid);
 
     @ApiOperation("出纳驳回")
     @PostMapping("/cashierReject")
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
index 682696d786..e6b93c075e 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
@@ -84,7 +84,7 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     }
 
     @Override
-    public ResultBean recallConfirm(String sid) {
+    public ResultBean recallConfirm(String sid,String userSid) {
         return null;
     }
 
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
index f95e8f5a6b..48258f2ef3 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
@@ -107,8 +107,8 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     }
 
     @Override
-    public ResultBean recallConfirm(String sid) {
-        return finCollectionConfirmationService.recallConfirm(sid);
+    public ResultBean recallConfirm(String sid,String userSid) {
+        return finCollectionConfirmationService.recallConfirm(sid,userSid);
     }
 
     @Override
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 9646f4a041..498fb78705 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -4174,21 +4174,24 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return rb.success().setData(moneyAll);
     }
 
-    public ResultBean recallConfirm(String sid) {
+    public ResultBean recallConfirm(String sid,String userSid) {
         ResultBean rb = ResultBean.fireFail();
         FinCollectionConfirmation confirmation = fetchBySid(sid);
         if (confirmation == null) {
             return rb.setMsg("该申请不存在");
         }
-        if (!"0".equals(confirmation.getAuditState())) {
-            return rb.setMsg("该申请为待审核或正在审核中");
+        if(!userSid.equals(confirmation.getCreateBySid())){
+            return rb.setMsg("当前登录人员与发起人员不是同一人，不允许撤回");
         }
+       /* if (!"1".equals(confirmation.getAuditState())) {
+            return rb.setMsg("该申请未提交或已审核");
+        }*/
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1);
         finSelectedReceivablesDetailedVos.stream().forEach(v -> {
             String selectSid = v.getSid();
             FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid);
             finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
-            finSelectedReceivablesDetailed.setAuditState(0);
+            finSelectedReceivablesDetailed.setAuditState(4);
             finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
             //应收未收将款项加回来
             FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
@@ -4196,7 +4199,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
             finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
         });
-        confirmation.setAuditState(0);
+        confirmation.setAuditState(4);
+        confirmation.setReason("申请人已撤回");
         baseMapper.updateById(confirmation);
         return rb.success().setMsg("撤回成功");
     }