修改

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyVo.java

@@ -51,5 +51,5 @@ public class LoanRepurchaseApplyVo implements Vo {
     private String nodeState; // 流程实例的sid
 
     @ApiModelProperty("风控状态：0正常")
-    private Integer riskState;
+    private String riskStateValue;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java

@@ -561,6 +561,34 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
         }
     }
 
+    public static void main(String[] args) {
+        int size = 3;
+        BigDecimal executeAmountInArear = new BigDecimal("10.00");
+        Map<String, BigDecimal> vinAmountMap = new HashMap<>();
+
+        // 四舍五入到2位小数的平均值
+        BigDecimal roundedAverage = executeAmountInArear.divide(BigDecimal.valueOf(size), 2, RoundingMode.HALF_UP);
+        // n台车 × roundedAverage
+        BigDecimal totalRounded = roundedAverage.multiply(BigDecimal.valueOf(size)).setScale(2, RoundingMode.HALF_UP);
+
+        if (executeAmountInArear.setScale(2, RoundingMode.HALF_UP).compareTo(totalRounded) == 0) {
+            // 能整除，直接平均
+            System.out.println(roundedAverage);
+        } else {
+            // 不能整除，最后一台车补差值
+            BigDecimal totalForNMinusOne = roundedAverage.multiply(BigDecimal.valueOf(size - 1));
+            BigDecimal lastAmount = executeAmountInArear.subtract(totalForNMinusOne).setScale(2, RoundingMode.HALF_UP);
+
+            for (int i = 0; i < size; i++) {
+                if (i == size - 1) {
+                    vinAmountMap.put("111", lastAmount);
+                } else {
+                    vinAmountMap.put("222", roundedAverage);
+                }
+            }
+        }
+    }
+
     public void pushRiskToFin(String sid) {
         LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(sid);
         if (loanCaseExecuteApply != null) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml

@@ -71,7 +71,8 @@
         date_format ( p.dueDate, '%Y-%m-%d' ) dueDate,
         p.dueMoney,
         p.dept salesDept,
-        v.settleState
+        v.settleState,
+        v.riskState
         FROM
         loan_repayment_plan_details as p
         LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as v ON p.busVinSid = v.sid

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java

@@ -170,6 +170,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
                 apply(StringUtils.isNotEmpty(last), "date_format (a.dueDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
                 );
         queryWrapper.apply("a.settleState != 1");
+        queryWrapper.eq("a.riskState",0);//风控状态为正常的时候
         records = baseMapper.selRepaymentDetailsByDueDate(queryWrapper);
         records.removeAll(Collections.singleton(null));
         if (!records.isEmpty()) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml

@@ -42,7 +42,20 @@
         la.customerName,
         la.amount,
         date_format(la.prepareDate, '%Y-%m-%d' ) AS prepareDate,
-        bv.riskState
+        case bv.riskState
+        when 0 then '正常'
+        when 1 then '交回'
+        when 4 then '赎回中'
+        when 5 then '二次销售中'
+        when 6 then '转租中'
+        when 7 then '处置损失'
+        when 8 then '不追偿'
+        when 9 then '直接诉讼立案'
+        when 11 then '亏损立案'
+        when 12 then '执行'
+        when 13 then '诉讼结案'
+        when 14 then '执行结案'
+        end as riskStateValue
         FROM
         loan_repurchase_apply la
         left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = la.busVinSid