✨ 同步客户区域字段并统一字典标识

bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomer.java

@@ -47,9 +47,9 @@ public class BmsCustomer extends BaseEntity
     @Excel(name = "业务类型", readConverterExp = "0=直客,1=同行,2=集运")
     private String customerType;
 
-    /** 区域类型（字典 data_area_type） */
-    @Excel(name = "区域类型", dictType = "data_area_type")
-    private String areaType;
+    /** 客户区域（字典 customer_area） */
+    @Excel(name = "客户区域", dictType = "customer_area")
+    private String customerArea;
 
     /** 启用状态（0正常 1停用） */
     @Excel(name = "启用状态", readConverterExp = "0=正常,1=停用")

bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/impl/BmsCustomerLogServiceImpl.java

@@ -45,10 +45,10 @@ public class BmsCustomerLogServiceImpl implements IBmsCustomerLogService
     private static final ThreadLocal<SimpleDateFormat> DATE_FMT =
             ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyy-MM-dd"));
 
-    /** 区域类型走字典 data_area_type；缓存未命中时保留原编码。 */
-    private static String areaTypeLabel(String value)
+    /** 客户区域走字典 customer_area；缓存未命中时保留原编码。 */
+    private static String customerAreaLabel(String value)
     {
-        String label = DictUtils.getDictLabel("data_area_type", value);
+        String label = DictUtils.getDictLabel("customer_area", value);
         return StringUtils.isEmpty(label) ? value : label;
     }
 
@@ -77,7 +77,7 @@ public class BmsCustomerLogServiceImpl implements IBmsCustomerLogService
     /**
      * 需要记录日志的主表字段（顺序即展示顺序）。
      * requireNonBlank 为 true 的字段对应 update SQL 的 &lt;if test="x!=null and x!=''"&gt;，
-     * 其余动态字段仅在新值非 null 时落库；业务员/结算员/客服、区域类型为无条件写入。
+     * 其余动态字段仅在新值非 null 时落库；业务员/结算员/客服、客户区域为无条件写入。
      */
     private static final List<FieldDef> FIELD_DEFS = List.of(
             new FieldDef("customerCode", "客户编码", BmsCustomer::getCustomerCode, true, Function.identity()),
@@ -85,7 +85,7 @@ public class BmsCustomerLogServiceImpl implements IBmsCustomerLogService
             new FieldDef("customerCodeDw", "对外代码", BmsCustomer::getCustomerCodeDw, false, Function.identity()),
             new FieldDef("creditCode", "统一社会信用代码", BmsCustomer::getCreditCode, false, Function.identity()),
             new FieldDef("customerType", "业务类型", BmsCustomer::getCustomerType, false, CUSTOMER_TYPE_MAP::get),
-            new FieldDef("areaType", "区域类型", BmsCustomer::getAreaType, false, BmsCustomerLogServiceImpl::areaTypeLabel),
+            new FieldDef("customerArea", "客户区域", BmsCustomer::getCustomerArea, false, BmsCustomerLogServiceImpl::customerAreaLabel),
             new FieldDef("isEnable", "启用状态", BmsCustomer::getIsEnable, false, ENABLE_MAP::get),
             new FieldDef("salesUserId", "业务员", c -> userDisplay(c.getSalesUserId(), c.getSalesUser()), false, Function.identity()),
             new FieldDef("ed", "资金额度(元)", BmsCustomer::getEd, false, BmsCustomerLogServiceImpl::numText),
@@ -208,8 +208,8 @@ public class BmsCustomerLogServiceImpl implements IBmsCustomerLogService
         {
             // 与 update SQL 的动态条件保持一致：未提交（null/空串）的字段本次不落库，不参与比对
             Object raw = def.rawGetter.apply(newCustomer);
-            // 合同起止、区域类型允许清空；其余动态字段未提交时不落库，也不记日志
-            if (raw == null && !isContractDateField(def.field) && !"areaType".equals(def.field))
+            // 合同起止、客户区域允许清空；其余动态字段未提交时不落库，也不记日志
+            if (raw == null && !isContractDateField(def.field) && !"customerArea".equals(def.field))
             {
                 continue;
             }

bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/sync/CustomerSyncService.java

@@ -60,6 +60,7 @@ public class CustomerSyncService
     private static final int LEN_CODE = 50;
     private static final int LEN_NAME = 100;
     private static final int LEN_CODE_DW = 50;
+    private static final int LEN_CUSTOMER_AREA = 32;
     private static final int LEN_USER = 50;
     private static final int LEN_REMARK = 500;
     /** 告警明细最多打印条数 */
@@ -178,6 +179,7 @@ public class CustomerSyncService
         c.setDelFlag("0");
 
         c.setCustomerCodeDw(truncate(getStr(row, "CUSTOMER_OUTER_CODE"), LEN_CODE_DW, code, "customer_code_dw", warnings));
+        c.setCustomerArea(truncate(getStr(row, "CUSTOMER_AREA"), LEN_CUSTOMER_AREA, code, "customer_area", warnings));
         String sourceSalesCode = clean(getStr(row, "BELONG_SALER"));
         c.setSourceSalesCode(sourceSalesCode);
         c.setSalesUserId(resolveSalesUserId(sourceSalesCode, userIdsByLogin,