Merge branch 'master_cj_zq' into master_sample_order

@@ -535,6 +535,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             if (CollectionUtils.isEmpty(list)) {
                 continue;
             }
+            BigDecimal totalDebt = BigDecimal.ZERO;
             long waitDeliveredOrderTotal = 0;
             Map<String, ReceiptLedgerReportDetail> reportDetailMap = new LinkedHashMap<>();
             for (Map<String, Object> map : list) {
@@ -575,9 +576,11 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                 }
                 debtTotal = debtTotal.add(debtAmount);
                 reportDetail.setDebtTotal(debtTotal);
+                totalDebt = totalDebt.add(debtAmount);
 
                 reportDetailMap.put(reportDetail.getCustomerName(), reportDetail);
             }
+            report.setDebtTotal(totalDebt);
             List<ReceiptLedgerReportDetail> details = new ArrayList<>(reportDetailMap.values());
             if (CollectionUtils.isNotEmpty(details)) {
                 for (ReceiptLedgerReportDetail detail : details) {

@@ -231,8 +231,7 @@
                tb.region,
                r.name as region_name,
                max(cc.company_credit_limit) as quota,
-               max(cc.company_settlement_period) as settle_term,
-               sum(rl.end_account_receivable) as debtTotal
+               max(cc.company_settlement_period) as settle_term
         from base_data_customer_short tb
         left join sys_dept d on tb.dept_id = d.id
         left join sys_dept r on tb.region = r.id