款项驳回时应收未收重新添加已选择的款项明细

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -87,7 +87,7 @@ public interface FinCollectionConfirmationFeign {
 
     @ApiOperation("出纳驳回")
     @PostMapping("/cashierReject")
-    public ResultBean cashierReject(FinCollectionRejectQuery finCollectionRejectQuery);
+    public ResultBean cashierReject(@Valid FinCollectionRejectQuery finCollectionRejectQuery);
 
     @ApiOperation("生成收款单pdf")
     @PostMapping("/createPdf")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionRejectQuery.java

@@ -3,6 +3,8 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @Author dimengzhe
  * @Date 2023/1/9 13:48
@@ -13,6 +15,7 @@ public class FinCollectionRejectQuery {
     @ApiModelProperty("款项确认sid")
     private String sid;
     @ApiModelProperty("驳回原因")
+    @NotBlank(message = "驳回原因不能为空")
     private String reason;
     @ApiModelProperty("当前登录人用户sid")
     private String userSid;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1267,6 +1267,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
             finSelectedReceivablesDetailed.setAuditState(2);
             finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
+            BigDecimal subscriptionMoney = new BigDecimal(v.getSubscriptionMoney());
+            FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
+            BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney();
+            String curRecMoney = String.valueOf(currentReceivableMoney.add(subscriptionMoney));
+            finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, finUncollectedReceivablesDetailed.getSid());
         });
         confirmation.setAuditState(2);
         //更新驳回原因