Merge remote-tracking branch 'origin/master'

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

@@ -200,4 +200,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     void update4asWxdState(@Param("wxdSid") String wxdSid);
 
     List<FinCollectionConfirmation> selectNotPush();
+
+    String selectCurrentMoney(String sid);
 }

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

@@ -535,4 +535,29 @@
     <select id="selectNotPush" resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation">
         select * from fin_collection_confirmation where confirmDate>='2025-03-01' and auditState = 3
     </select>
+
+    <select id="selectCurrentMoney" resultType="java.lang.String">
+        SELECT
+            CAST((COALESCE(furd.reveivableMoney, 0) - COALESCE(df.dbalance, 0)) AS CHAR) AS currentReceivableMoney
+        FROM fin_uncollected_receivables_detailed furd
+                 LEFT JOIN (
+            SELECT
+                d.receivablesSid,
+                SUM(COALESCE(d.subscriptionMoney, 0) - COALESCE(f.thisUseMoney, 0)) AS dbalance
+            FROM fin_selected_receivables_detailed d
+                     LEFT JOIN (
+                SELECT
+                    f.busSid,
+                    SUM(COALESCE(f.thisUseMoney, 0)) AS thisUseMoney
+                FROM fin_funds_carried_forward_veh f
+                         JOIN fin_funds_carried_forward_apply fa ON f.mainSid = fa.sid
+                WHERE fa.nodeState != '终止'
+                GROUP BY f.busSid
+            ) f ON f.busSid = d.sid
+            WHERE d.auditState IN (1, 3)
+            GROUP BY d.receivablesSid
+        ) df ON df.receivablesSid = furd.sid
+        WHERE furd.sid = #{sid}
+        LIMIT 1
+    </select>
 </mapper>

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

@@ -2018,6 +2018,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             for (int i = 0; i < finLi.size(); i++) {
                 FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finLi.get(i);
                 FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
+                //当前应收金额
+                String currentReceivableMoney = baseMapper.selectCurrentMoney(finUncollectedReceivablesDetailed.getSid());
                 BaseVehicle baseVehicle = baseMapper.selectByVSid(finUncollectedReceivablesDetailed.getBusVinSid());
                 BigDecimal bigAdd = BigDecimal.ZERO;
                 BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
@@ -2076,7 +2078,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 loanDiffDetailssDto.setBankName(loanFinPolicy.getBankShortName());
                                 loanDiffDetailssDto.setBorrowName(busSalesOrderVehicle.getBorrowName());
                                 loanDiffDetailssDto.setBorrowSid(busSalesOrderVehicle.getBorrowerSid());
-                                loanDiffDetailssDto.setMakeLoan(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()));
+//                                loanDiffDetailssDto.setMakeLoan(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()));
+                                loanDiffDetailssDto.setMakeLoan(new BigDecimal(currentReceivableMoney));
                                 loanDiffDetailssDto.setRealityLoan(finSelectedReceivablesDetailed.getSubscriptionMoney());
                                 loanDiffDetailssDto.setDiffLoan(decimalAll);
                                 loanDiffDetailssDto.setMakeDiscount(loanSolutions.getActualDiscount());
@@ -2251,7 +2254,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             loanDiffDetailssDto.setBankName(loanFinPolicy.getBankShortName());
                             loanDiffDetailssDto.setBorrowName(busSalesOrderVehicle.getBorrowName());
                             loanDiffDetailssDto.setBorrowSid(busSalesOrderVehicle.getBorrowerSid());
-                            loanDiffDetailssDto.setMakeLoan(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()));
+//                            loanDiffDetailssDto.setMakeLoan(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()));
+                            loanDiffDetailssDto.setMakeLoan(new BigDecimal(currentReceivableMoney));
                             loanDiffDetailssDto.setRealityLoan(finSelectedReceivablesDetailed.getSubscriptionMoney());
                             loanDiffDetailssDto.setDiffLoan(decimalAll);
                             loanDiffDetailssDto.setMakeDiscount(loanSolutions.getActualDiscount());