Merge branch 'master_cj_zq' into master_sample_order

@@ -245,6 +245,9 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                 .eq(ReceiptLedgerInfo::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);
+        // 检查是否超期或超额（冻结）
+        autoFreeze(data.getCustomerId());
+
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
     }
@@ -853,10 +856,13 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         }
         Map<String, Boolean> result = new HashMap<>();
         for (ReceiptLedgerInfo ledgerInfo : ledgerInfoList) {
+            Boolean excessOrOverdue = result.get(ledgerInfo.getCustomerId());
             String debtStatus = ledgerInfo.getDebtStatus();
             BigDecimal endAccountReceivable = ledgerInfo.getEndAccountReceivable();
             if (StringUtils.isBlank(debtStatus) || endAccountReceivable.compareTo(BigDecimal.ZERO) <= 0) {
-                result.put(ledgerInfo.getCustomerId(), Boolean.FALSE);
+                if (excessOrOverdue == null) {
+                    result.put(ledgerInfo.getCustomerId(), Boolean.FALSE);
+                }
             } else {
                 CustomerCredit customerCredit = customerCreditMap.get(ledgerInfo.getCustomerId());
                 if ("AGREEMENT".equals(debtStatus) && customerCredit != null) {
@@ -865,8 +871,10 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                     endAccountReceivable = valueConvert(endAccountReceivable);
 
                     boolean isDebt = StringUtils.isBlank(companyCreditLimit) || endAccountReceivable.compareTo(new BigDecimal(companyCreditLimit)) > 0;
-                    result.put(ledgerInfo.getCustomerId(), isDebt);
-                } else {
+                    if (!BooleanUtils.isTrue(excessOrOverdue)) {
+                        result.put(ledgerInfo.getCustomerId(), isDebt);
+                    }
+                } else if (!BooleanUtils.isTrue(excessOrOverdue)) {
                     result.put(ledgerInfo.getCustomerId(), Boolean.TRUE);
                 }
             }

@@ -134,15 +134,15 @@
         </where>
         ORDER BY
         CASE
-            WHEN d.name like '宁波办%' THEN 1
-            WHEN d.name like '温州办%' THEN 2
-            WHEN d.name like '东莞办%' THEN 3
-            WHEN d.name like '佛山办%' THEN 4
-            WHEN d.name like '苏州办%' THEN 5
-            WHEN d.name like '常州办%' THEN 6
-            WHEN d.name like '北方办%' THEN 7
-            WHEN d.name like '紫铜办%' THEN 8
-            WHEN d.name like '外贸办%' THEN 9
+            WHEN d.code = 'NB' THEN 1
+            WHEN d.code = 'WZ' THEN 2
+            WHEN d.code = 'DG' THEN 3
+            WHEN d.code = 'FS' THEN 4
+            WHEN d.code = 'SZ' THEN 5
+            WHEN d.code = 'CZ' THEN 6
+            WHEN d.code = 'BF' THEN 7
+            WHEN d.code = 'ZT' THEN 8
+            WHEN d.code = 'WM' THEN 9
         ELSE 10  -- 其他办事处按字母顺序排在后面
         END,
         d.name ASC,
@@ -284,15 +284,15 @@
         </if>
         order by
         case
-            when d.name like '宁波办%' then 1
-            when d.name like '温州办%' then 2
-            when d.name like '东莞办%' then 3
-            when d.name like '佛山办%' then 4
-            when d.name like '苏州办%' then 5
-            when d.name like '常州办%' then 6
-            when d.name like '北方办%' then 7
-            when d.name like '紫铜办%' then 8
-            when d.name like '外贸办%' then 9
+            when d.code = 'NB' then 1
+            when d.code = 'WZ' then 2
+            when d.code = 'DG' then 3
+            when d.code = 'FS' then 4
+            when d.code = 'SZ' then 5
+            when d.code = 'CZ' then 6
+            when d.code = 'BF' then 7
+            when d.code = 'ZT' then 8
+            when d.code = 'WM' then 9
         else 10  -- 其他办事处按字母顺序排在后面
         end,
         d.name asc,