楚江erp：1、台账报表统计逻辑调整；2、定时任务更新台账欠款状态

@@ -114,7 +114,7 @@ public class ReceiptLedgerReportBo {
     /**
     /**
      * 授时状态
      * 授时状态
      */
      */
-    @ApiModelProperty("总欠款")
+    @ApiModelProperty("授时状态")
     private String timingStatus;
     private String timingStatus;
 
 
     /**
     /**

@@ -179,7 +179,7 @@ public class ReceiptLedgerInfoController extends DefaultBaseController {
     /**
     /**
      * 重新生成新的台账数据
      * 重新生成新的台账数据
      */
      */
-    @ApiOperation("自动生成台账明细数据")
+    @ApiOperation("重新生成新的台账数据")
     @GetMapping("/againGenerate")
     @GetMapping("/againGenerate")
     @Scheduled(cron = "0 30 2 1 * ?")
     @Scheduled(cron = "0 30 2 1 * ?")
     public InvokeResult<Void> againGenerate() {
     public InvokeResult<Void> againGenerate() {
@@ -263,11 +263,23 @@ public class ReceiptLedgerInfoController extends DefaultBaseController {
     /**
     /**
      * 冻结欠款客户订货单、草稿要车单数据
      * 冻结欠款客户订货单、草稿要车单数据
      */
      */
-    @ApiOperation("自动生成台账明细数据")
+    @ApiOperation("自动冻结")
     @GetMapping("/autoFreeze")
     @GetMapping("/autoFreeze")
     @Scheduled(cron = "0 50 2 * * ?")
     @Scheduled(cron = "0 50 2 * * ?")
     public InvokeResult<Void> autoFreeze() {
     public InvokeResult<Void> autoFreeze() {
         receiptLedgerInfoService.autoFreeze(null);
         receiptLedgerInfoService.autoFreeze(null);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
+
+
+    /**
+     * 更新欠款状态
+     */
+    @ApiOperation("更新欠款状态")
+    @GetMapping("/autoUpdateDebtStatus")
+    @Scheduled(cron = "0 50 1 * * ?")
+    public InvokeResult<Void> autoUpdateDebtStatus() {
+        receiptLedgerInfoService.autoUpdateDebtStatus();
+        return InvokeResultBuilder.success();
+    }
 }
 }

@@ -49,10 +49,13 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAdjusters;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 
 
@@ -495,13 +498,17 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             return result;
             return result;
         }
         }
         List<String> shortNames = dataList.stream().map(ReceiptLedgerReportBo::getCustomerShortName).distinct().collect(Collectors.toList());
         List<String> shortNames = dataList.stream().map(ReceiptLedgerReportBo::getCustomerShortName).distinct().collect(Collectors.toList());
+        // 根据简称获取台账明细数据
+        Map<String, List<ReceiptLedgerInfo>> agreementDataMap = getLedgerInfoByShortName(shortNames, Boolean.FALSE);
+        Map<String, List<ReceiptLedgerInfo>> overdueDataMap = getLedgerInfoByShortName(shortNames, Boolean.TRUE);
         // 只统计约定内、一次、二次协调、清欠阶段
         // 只统计约定内、一次、二次协调、清欠阶段
         List<String> debtStatusList = new ArrayList<>();
         List<String> debtStatusList = new ArrayList<>();
         debtStatusList.add("AGREEMENT");
         debtStatusList.add("AGREEMENT");
         debtStatusList.add("FIRST_COORDINATE");
         debtStatusList.add("FIRST_COORDINATE");
         debtStatusList.add("SECOND_COORDINATE");
         debtStatusList.add("SECOND_COORDINATE");
         debtStatusList.add("CLEAR_DEBTS");
         debtStatusList.add("CLEAR_DEBTS");
-        List<Map<String, Object>> debtAmountList = getBaseMapper().statisticsDeptByShortName(shortNames, debtStatusList);
+        debtStatusList.add("DEPOSIT");
+        List<Map<String, Object>> debtAmountList = getBaseMapper().statisticsDebtByShortName(shortNames, debtStatusList, "INSIDE");
         if (CollectionUtils.isEmpty(debtAmountList)) {
         if (CollectionUtils.isEmpty(debtAmountList)) {
             return result;
             return result;
         }
         }
@@ -525,12 +532,8 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             if (CollectionUtils.isEmpty(list)) {
             if (CollectionUtils.isEmpty(list)) {
                 continue;
                 continue;
             }
             }
-            BigDecimal debtTotal = BigDecimal.ZERO;
-            BigDecimal agreementTotal = BigDecimal.ZERO;
-            BigDecimal firstCoordinateTotal = BigDecimal.ZERO;
-            BigDecimal secondCoordinateTotal = BigDecimal.ZERO;
-            BigDecimal clearDebtTotal = BigDecimal.ZERO;
             long waitDeliveredOrderTotal = 0;
             long waitDeliveredOrderTotal = 0;
+            List<String> creditStatusList = new ArrayList<>();
             List<String> debtStates = new ArrayList<>();
             List<String> debtStates = new ArrayList<>();
             Map<String, ReceiptLedgerReportDetail> reportDetailMap = new LinkedHashMap<>();
             Map<String, ReceiptLedgerReportDetail> reportDetailMap = new LinkedHashMap<>();
             for (Map<String, Object> map : list) {
             for (Map<String, Object> map : list) {
@@ -545,24 +548,31 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                 }
                 }
                 reportDetail.setCustomerName(customerName);
                 reportDetail.setCustomerName(customerName);
                 reportDetail.setCreditStatus(debtStatus);
                 reportDetail.setCreditStatus(debtStatus);
-                if ("AGREEMENT".equals(debtStatus)) {
-                    reportDetail.setAgreement(valueConvert(debtAmount));
-                    agreementTotal = agreementTotal.add(debtAmount);
+                if ("AGREEMENT".equals(debtStatus) || "DEPOSIT".equals(debtStatus)) {
+                    BigDecimal agreement = reportDetail.getAgreement();
+                    if (agreement == null) {
+                        agreement = debtAmount;
+                    } else {
+                        agreement = agreement.add(debtAmount);
+                    }
+                    reportDetail.setAgreement(valueConvert(agreement));
                     reportDetail.setCreditStatus("约定内");
                     reportDetail.setCreditStatus("约定内");
                 } else if ("FIRST_COORDINATE".equals(debtStatus)) {
                 } else if ("FIRST_COORDINATE".equals(debtStatus)) {
                     reportDetail.setFirstCoordinate(valueConvert(debtAmount));
                     reportDetail.setFirstCoordinate(valueConvert(debtAmount));
-                    firstCoordinateTotal = firstCoordinateTotal.add(debtAmount);
                     reportDetail.setCreditStatus("超期1");
                     reportDetail.setCreditStatus("超期1");
                 } else if ("SECOND_COORDINATE".equals(debtStatus)) {
                 } else if ("SECOND_COORDINATE".equals(debtStatus)) {
                     reportDetail.setSecondCoordinate(valueConvert(debtAmount));
                     reportDetail.setSecondCoordinate(valueConvert(debtAmount));
-                    secondCoordinateTotal = secondCoordinateTotal.add(debtAmount);
                     reportDetail.setCreditStatus("超期2");
                     reportDetail.setCreditStatus("超期2");
                 } else if ("CLEAR_DEBTS".equals(debtStatus)) {
                 } else if ("CLEAR_DEBTS".equals(debtStatus)) {
                     reportDetail.setClearDebt(valueConvert(debtAmount));
                     reportDetail.setClearDebt(valueConvert(debtAmount));
-                    clearDebtTotal = clearDebtTotal.add(debtAmount);
                     reportDetail.setCreditStatus("超期3");
                     reportDetail.setCreditStatus("超期3");
                 }
                 }
-                debtTotal = debtTotal.add(debtAmount);
+                // 计算超额数据（授信状态）
+                String creditStatus = calculateExcess(debtAmount, report.getQuota());
+                if (StringUtils.isNotBlank(creditStatus)) {
+                    report.setCreditStatus(creditStatus);
+                    creditStatusList.add(creditStatus);
+                }
                 // 统计待交付订单数
                 // 统计待交付订单数
                 Long count = orderCountMap.get(customerName);
                 Long count = orderCountMap.get(customerName);
                 if (count != null) {
                 if (count != null) {
@@ -575,14 +585,15 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             List<ReceiptLedgerReportDetail> details = new ArrayList<>(reportDetailMap.values());
             List<ReceiptLedgerReportDetail> details = new ArrayList<>(reportDetailMap.values());
             report.setDetailList(details);
             report.setDetailList(details);
 
 
-            report.setDebtTotal(valueConvert(debtTotal));
-            report.setAgreementTotal(valueConvert(agreementTotal));
-            report.setFirstCoordinateTotal(valueConvert(firstCoordinateTotal));
-            report.setSecondCoordinateTotal(valueConvert(secondCoordinateTotal));
-            report.setClearDebtTotal(valueConvert(clearDebtTotal));
-            report.setCreditStatus(getHighestPriorityStatus(debtStates));
-            // 处理超额逻辑
+            // 处理约定内、一次协调、二次协调、清欠小计数据
+            handleSubtotal(agreementDataMap, overdueDataMap, report);
+            // 授时状态
+            report.setTimingStatus(getHighestPriorityStatus(debtStates));
+            // 授信状态
+            report.setCreditStatus(findMaxPercentageString(creditStatusList));
             report.setWaitDeliveredOrderTotal(waitDeliveredOrderTotal);
             report.setWaitDeliveredOrderTotal(waitDeliveredOrderTotal);
+            BigDecimal debtTotal = report.getDebtTotal();
+            report.setDebtTotal(valueConvert(debtTotal));
         }
         }
         return result;
         return result;
     }
     }
@@ -852,6 +863,36 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         shipmentsPlanDetailService.delByOrderIds(needFreezeOrderIds);
         shipmentsPlanDetailService.delByOrderIds(needFreezeOrderIds);
     }
     }
 
 
+    @Override
+    public void autoUpdateDebtStatus() {
+        // 获取当月所有台账明细数据
+        QueryReceiptLedgerInfoVo ledgerInfoVo = new QueryReceiptLedgerInfoVo();
+        LocalDateTime startTime = YearMonth.now()
+                .atDay(1)
+                .atStartOfDay();
+        LocalDateTime endTime = YearMonth.now()
+                .atEndOfMonth()
+                .atTime(23, 59, 59);
+        ledgerInfoVo.setCreateTimeStart(startTime.toString());
+        ledgerInfoVo.setCreateTimeEnd(endTime.toString());
+        List<ReceiptLedgerInfo> ledgerInfoList = getBaseMapper().query(ledgerInfoVo);
+        if (CollectionUtils.isEmpty(ledgerInfoList)) {
+            return;
+        }
+        for (ReceiptLedgerInfo info : ledgerInfoList) {
+            BigDecimal endAccountReceivable = info.getEndAccountReceivable();
+            LocalDate processedDate = info.getProcessedDate();
+            if (processedDate != null) {
+                // 更新欠款状态
+                String debtStatus = getSettlementStatus(endAccountReceivable, processedDate);
+                LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class);
+                updateWrapper.set(ReceiptLedgerInfo::getDebtStatus, debtStatus)
+                        .eq(ReceiptLedgerInfo::getId, info.getId());
+                getBaseMapper().update(updateWrapper);
+            }
+        }
+    }
+
 
 
     /**
     /**
      * 从多个状态中获取最高优先级的状态
      * 从多个状态中获取最高优先级的状态
@@ -911,4 +952,96 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
     }
     }
+
+
+    /**
+     * 计算超额比例
+     *
+     * @param amount    欠款金额
+     * @param quota     额度
+     * @return          String
+     */
+    private String calculateExcess(BigDecimal amount, BigDecimal quota) {
+        if (amount == null || amount.compareTo(BigDecimal.ZERO) <= 0
+                || quota == null || quota.compareTo(BigDecimal.ZERO) <= 0) {
+            return null;
+        }
+        // 万元转换成元
+        quota = quota.multiply(new BigDecimal(10000));
+        if (amount.compareTo(quota) <= 0) {
+            return null;
+        }
+        BigDecimal result = amount.subtract(quota)
+                .divide(quota, 2, RoundingMode.HALF_UP)
+                .multiply(new BigDecimal(100))
+                .divide(new BigDecimal("5"), 0, RoundingMode.CEILING)
+                .multiply(new BigDecimal("5"));
+
+        return "超额" + result + "%";
+    }
+
+
+    /**
+     * 获取最大值对应的完整字符串
+     */
+    public static String findMaxPercentageString(List<String> dataList) {
+        if (CollectionUtils.isEmpty(dataList)) {
+            return null;
+        }
+        String maxString = null;
+        int maxValue = 0;
+        for (String str : dataList) {
+            // 提取数字
+            Pattern pattern = Pattern.compile("(\\d+)%");
+            Matcher matcher = pattern.matcher(str);
+            if (matcher.find()) {
+                int value = Integer.parseInt(matcher.group(1));
+                if (value > maxValue) {
+                    maxValue = value;
+                    maxString = str;
+                }
+            }
+        }
+        return maxString;
+    }
+
+
+    /**
+     * 处理“小计”数据
+     *
+     * @param agreementDataMap    约定内数据集合
+     * @param overdueDataMap      逾期数据集合
+     * @param report              报表数据
+     */
+    private void handleSubtotal(Map<String, List<ReceiptLedgerInfo>> agreementDataMap, Map<String, List<ReceiptLedgerInfo>> overdueDataMap
+            , ReceiptLedgerReportBo report) {
+        String customerShortName = report.getCustomerShortName();
+    }
+
+
+    /**
+     * 获取台账明细数据
+     * 根据客户简称、状态分组
+     *
+     * @param shortNames    客户简称集合
+     * @param overdue       是否逾期
+     * @return              Map<String, List<ReceiptLedgerInfo>>
+     */
+    private Map<String, List<ReceiptLedgerInfo>> getLedgerInfoByShortName(List<String> shortNames, Boolean overdue) {
+        // 根据简称获取台账明细
+        List<ReceiptLedgerInfo> ledgerInfoList = getBaseMapper().queryByShortName(shortNames, "INSIDE", overdue);
+        if (CollectionUtils.isEmpty(ledgerInfoList)) {
+            return Collections.emptyMap();
+        }
+        // 根据欠款状态分组
+        Map<String, List<ReceiptLedgerInfo>> ledgerInfoMap = new HashMap<>();
+        for (ReceiptLedgerInfo ledgerInfo : ledgerInfoList) {
+            String debtStatus = ledgerInfo.getDebtStatus();
+            String shortName = ledgerInfo.getCustomerShortName();
+            String key = shortName + "_" + debtStatus;
+            List<ReceiptLedgerInfo> list = ledgerInfoMap.computeIfAbsent(key, k -> new ArrayList<>());
+            list.add(ledgerInfo);
+        }
+        return ledgerInfoMap;
+    }
 }
 }

@@ -56,5 +56,16 @@ public interface ReceiptLedgerInfoMapper extends BaseMapper<ReceiptLedgerInfo> {
      * @param shortNames    客户简称
      * @param shortNames    客户简称
      * @return              List<Map<String, BigDecimal>>
      * @return              List<Map<String, BigDecimal>>
      */
      */
-    List<Map<String, Object>> statisticsDeptByShortName(@Param("shortNames") List<String> shortNames, @Param("debtStatusList") List<String> debtStatusList);
+    List<Map<String, Object>> statisticsDebtByShortName(@Param("shortNames") List<String> shortNames, @Param("debtStatusList") List<String> debtStatusList
+            , @Param("type") String type);
+
+    /**
+     * 根据客户简称获取台账明细数据
+     *
+     * @param shortNames 客户简称集合
+     * @param type       类型（内贸、外贸）
+     * @param overdue    是否逾期
+     * @return           List<ReceiptLedgerInfo>
+     */
+    List<ReceiptLedgerInfo> queryByShortName(@Param("shortNames") List<String> shortNames, @Param("type") String type, @Param("overdue") Boolean overdue);
 }
 }

@@ -143,4 +143,9 @@ public interface ReceiptLedgerInfoService extends BaseMpService<ReceiptLedgerInf
      * 冻结欠款客户，管控发货
      * 冻结欠款客户，管控发货
      */
      */
     void autoFreeze(String customerId);
     void autoFreeze(String customerId);
+
+    /**
+     * 更新欠款状态
+     */
+    void autoUpdateDebtStatus();
 }
 }

@@ -238,6 +238,7 @@
         left join customer_credit cc on tb.customer_id = cc.company_id
         left join customer_credit cc on tb.customer_id = cc.company_id
         left join receipt_ledger_info rl on tb.id = rl.customer_short_id
         left join receipt_ledger_info rl on tb.id = rl.customer_short_id
         <where>
         <where>
+            and rl.type = 'INSIDE'
             <if test="vo.customerType != null and vo.customerType != ''">
             <if test="vo.customerType != null and vo.customerType != ''">
                 and tb.type = #{vo.customerType}
                 and tb.type = #{vo.customerType}
             </if>
             </if>
@@ -258,7 +259,7 @@
         </if>
         </if>
     </select>
     </select>
 
 
-    <select id="statisticsDeptByShortName" resultType="java.util.Map">
+    <select id="statisticsDebtByShortName" resultType="java.util.Map">
         select c.name,
         select c.name,
                cs.short_name,
                cs.short_name,
                tb.debt_status,
                tb.debt_status,
@@ -266,15 +267,53 @@
         from receipt_ledger_info tb
         from receipt_ledger_info tb
         inner join base_data_customer_short cs on tb.customer_id = cs.customer_id
         inner join base_data_customer_short cs on tb.customer_id = cs.customer_id
         inner join base_data_customer c on tb.customer_id = c.id
         inner join base_data_customer c on tb.customer_id = c.id
-        where cs.short_name in
-        <foreach collection="shortNames" open="(" separator="," close=")" item="item">
-            #{item}
-        </foreach>
-        and tb.debt_status in
-        <foreach collection="debtStatusList" open="(" separator="," close=")" item="item">
-            #{item}
-        </foreach>
+        <where>
+            <if test="type != null and type != ''">
+                and tb.type = #{type}
+            </if>
+            and cs.short_name in
+            <foreach collection="shortNames" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+            and tb.debt_status in
+            <foreach collection="debtStatusList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </where>
         and tb.debt_status is not null
         and tb.debt_status is not null
         group by c.name,cs.short_name,tb.debt_status
         group by c.name,cs.short_name,tb.debt_status
     </select>
     </select>
+
+    <select id="queryByShortName" resultType="com.lframework.xingyun.sc.entity.ReceiptLedgerInfo">
+        select tb.*,
+               cs.short_name as customer_short_name
+        from receipt_ledger_info tb
+        left join base_data_customer_short cs on tb.customer_id = cs.customer_id
+        <where>
+            <if test="type != null and type != ''">
+                and tb.type = #{type}
+            </if>
+            <if test="shortNames != null and shortNames.size() > 0">
+                and cs.short_name in
+                <foreach collection="shortNames" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="overdue != null">
+                <choose>
+                    <when test="overdue == true">
+                        and tb.processed_date &lt; curdate()
+                        order by tb.processed_date desc,tb.start_account_receivable asc
+                    </when>
+                    <otherwise>
+                        and (tb.processed_date >= curdate() or tb.end_account_receivable &lt; 0)
+                        order by
+                            case when tb.processed_date is null then 1 else 0 end,
+                            tb.processed_date,
+                            tb.start_account_receivable
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
 </mapper>
 </mapper>