款项申请确认部分修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1541,6 +1541,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                             unCollectionDto.setVinNo(vinList.get(i).toString());
                             unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
                             unCollectionDto.setUserSid(dto.getUserSid());
+                            unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
                             finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
                         }
                     } else {
@@ -1565,7 +1566,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                             unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
                             unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
                             unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
-//                            unCollectionDto.setUserSid(dto.getUserSid());
+                            unCollectionDto.setUserSid(dto.getUserSid());
+                            unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
                             finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
                         }
                     }

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

@@ -51,6 +51,8 @@ import java.util.List;
 @Data
 public class FinCollectionConfirmationDetailsVo implements Vo {
 
+    @ApiModelProperty("sid")
+    private String sid;
     
 	@ApiModelProperty("创建人接口")
     private String createByName; // 创建人接口

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

@@ -81,8 +81,8 @@ public class FinCollectionConfirmationDto implements Dto {
     private String paymentVoucherUrl; // 打款凭证Url
 	@ApiModelProperty("汇款确认书Url")
     private String remittanceConfirmationUrl; // 汇款确认书Url
-	@ApiModelProperty("余额")
-    private String balance; // 余额
+/*	@ApiModelProperty("余额")
+    private String balance;*/
 	@ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
     @ApiModelProperty("备注")

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

@@ -66,6 +66,6 @@ public class FinCollectionConfirmationVo implements Vo {
     private String remarks; // 备注
     @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）")
     private Integer auditState; // 审核状态
-    /*@ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）")
-    private Integer subscriptionState; // 审核状态*/
+    @ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）")
+    private Integer subscriptionState; // 审核状态
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java

@@ -82,4 +82,7 @@ public class FinSelectedReceivablesDetailed extends BaseEntity {
 	private Integer auditState; // 审核状态
 	@ApiModelProperty("审核时间")
 	private String auditDate; // 审核时间
+
+	@ApiModelProperty("应收未收sid")
+	private String receivablesSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java

@@ -78,4 +78,7 @@ public class FinSelectedReceivablesDetailedDto implements Dto {
     private String subscriptionDate; // 认款申请日期
 	@ApiModelProperty("收款确认单sid")
     private String collSid; // 收款确认单sid
+
+    @ApiModelProperty("应收未收款项sid")
+    private String receivablesSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java

@@ -82,4 +82,7 @@ public class FinUncollectedReceivablesDetailed extends BaseEntity {
     
 	@ApiModelProperty("当前应收金额")
     private BigDecimal currentReceivableMoney; // 当前应收金额
+
+    @ApiModelProperty("应收金额（不变）")
+    private String reveivableMoney;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java

@@ -49,4 +49,8 @@ public class UnCollectionDto implements Dto {
     @ApiModelProperty("用户sid:创建人")
     private String userSid;
 
+
+    @ApiModelProperty("应收金额（不变）")
+    private String reveivableMoney;
+
 }

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

@@ -36,6 +36,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -100,4 +101,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
 
 
     List<AppCollectionConfirmationStateVo> selectByState();
+
+    int updateBalanceBySid(@Param("sid") String sid, @Param("balanceBigDecimal") BigDecimal balanceBigDecimal);
 }

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

@@ -86,4 +86,8 @@
                  left join fin_selected_receivables_detailed fsrd on fcc.sid = fsrd.collSid
         where fcc.auditState = 1
     </select>
+
+    <update id="updateBalanceBySid">
+        update fin_collection_confirmation set balance = #{balanceBigDecimal} where sid = #{sid}
+    </update>
 </mapper>

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

@@ -330,7 +330,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
        /* if (subtract.compareTo(BigDecimal.ZERO) < 0) {
             return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对");
         }*/
-        finCollectionConfirmation.setBalance(collectionMoney);
+//        finCollectionConfirmation.setBalance(collectionMoney);
+        FinCollectionConfirmation confirmation = fetchBySid(dto.getSid());
+        finCollectionConfirmation.setBalance(confirmation.getBalance());
         finCollectionConfirmation.setAuditState(1);
         finCollectionConfirmation.setPaymentState(1);
         save(finCollectionConfirmation);
@@ -862,6 +864,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
 
     public ResultBean cashierConfirm(String sid) {
         ResultBean rb = ResultBean.fireFail();
+        FinCollectionConfirmation confirmation = fetchBySid(sid);
         baseMapper.cashierConfirm(sid);
         int auditState = 1;
         //总共认款金额
@@ -897,7 +900,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState);
             }*/
         }
-       /* FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
+        FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
         BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
         BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMoney);
         if (subtract.compareTo(BigDecimal.ZERO) == 0) {
@@ -906,7 +909,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         } else {
             int paymentState = 2;
             baseMapper.updatePaymentStateBySid(sid, paymentState);
-        }*/
+        }
+        //更新余额
+        BigDecimal balanceBigDecimal = confirmation.getBalance().subtract(totalSubscriptionMoney);
+        baseMapper.updateBalanceBySid(sid,balanceBigDecimal);
         //删除临时表的数据
         ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
         return rb.success().setMsg("款项确认成功");