From 0c477a232ccf08834b1e5909375863a902745f63 Mon Sep 17 00:00:00 2001 From: liuminghui <468701464@qq.com> Date: Wed, 18 Nov 2026 16:58:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E4=BB=98=E8=AE=A1=E8=B4=B9=E9=82=AE?= =?UTF-8?q?=E7=BC=96=E5=92=8C=E9=87=8D=E7=AE=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bms/price/pay/PayZoneMatcherTest.java | 11 ++ .../common/core/domain/model/LoginUser.java | 2 +- .../com/bms/price/domain/PayOrderRow.java | 3 + .../java/com/bms/price/pay/PayFeeMoney.java | 105 +++++++++++++++++- .../bms/price/pay/PayOrderFeeCalculator.java | 36 +++++- .../com/bms/price/pay/PayZoneMatcher.java | 5 + .../service/impl/PayOrderCostServiceImpl.java | 65 ++++++----- .../service/impl/PayOrderListServiceImpl.java | 3 +- .../service/impl/PrcOrderBillServiceImpl.java | 4 +- .../price/task/PayOrderRecalcAsyncRunner.java | 5 +- .../PrcOrderBillLocalRebillAsyncRunner.java | 17 ++- .../mapper/price/PayOrderListMapper.xml | 3 +- .../mapper/price/PrcPayBillFeeLogMapper.xml | 4 +- .../mapper/price/PrcPayBillFeeMapper.xml | 39 ++++--- .../views/price/billing/payOrder/index.vue | 23 +++- 15 files changed, 265 insertions(+), 60 deletions(-) diff --git a/bms-back/bms-admin/src/test/java/com/bms/price/pay/PayZoneMatcherTest.java b/bms-back/bms-admin/src/test/java/com/bms/price/pay/PayZoneMatcherTest.java index 4445ab5c..60a2b535 100644 --- a/bms-back/bms-admin/src/test/java/com/bms/price/pay/PayZoneMatcherTest.java +++ b/bms-back/bms-admin/src/test/java/com/bms/price/pay/PayZoneMatcherTest.java @@ -25,6 +25,17 @@ class PayZoneMatcherTest assertEquals("UK Mainland\n英国大陆", decision.getZoneName()); } + @Test + void ordinaryUkPostcodeIsMainlandAndNotARemoteZone() + { + PayZoneMatcher.Decision decision = PayZoneMatcher.resolve(ZONES, evriLines(), "KY4 0DN"); + assertNull(decision.getMessage()); + assertEquals("UK Mainland\n英国大陆", decision.getZoneName()); + PayZoneMatcher.Decision emptyBook = PayZoneMatcher.resolve(ZONES, List.of(), "KY4 0DN"); + assertNull(emptyBook.getMessage()); + assertEquals("UK Mainland\n英国大陆", emptyBook.getZoneName()); + } + @Test void northernIrelandAndHighlandsComeFromThePostcodeBook() { diff --git a/bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/LoginUser.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/LoginUser.java index 1875b8a9..8fb5be3a 100644 --- a/bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/LoginUser.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/LoginUser.java @@ -151,7 +151,7 @@ public class LoginUser implements UserDetails @Override public String getUsername() { - return user.getUserName(); + return user == null ? null : user.getUserName(); } /** diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/PayOrderRow.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PayOrderRow.java index 75c0422b..e2b45f8f 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/domain/PayOrderRow.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PayOrderRow.java @@ -23,6 +23,9 @@ public class PayOrderRow private String countryName; + /** 收件邮编,来自 prc_order_bill.dest_postcode */ + private String destPostcode; + private String channelName; private BigDecimal chargeWeight; diff --git a/bms-back/bms-system/src/main/java/com/bms/price/pay/PayFeeMoney.java b/bms-back/bms-system/src/main/java/com/bms/price/pay/PayFeeMoney.java index 0093e46a..164cab0a 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/pay/PayFeeMoney.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/pay/PayFeeMoney.java @@ -5,6 +5,8 @@ import java.math.RoundingMode; import java.util.Date; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.core.domain.model.LoginUser; import com.bms.common.utils.SecurityUtils; import com.bms.common.utils.StringUtils; import com.bms.system.domain.BmsExchangeRate; @@ -24,6 +26,11 @@ public class PayFeeMoney /** 汇总金额小数位 */ public static final int TOTAL_SCALE = 2; + /** 提交重算的那个人。后台线程没有登录态,用提交时记下的账号。 */ + private static final ThreadLocal BOUND_NAME = new ThreadLocal<>(); + + private static final ThreadLocal BOUND_ID = new ThreadLocal<>(); + @Autowired private IBmsExchangeRateService exchangeRateService; @@ -57,17 +64,107 @@ public class PayFeeMoney return value.setScale(TOTAL_SCALE, RoundingMode.HALF_UP); } - /** 当前登录用户的主键。没有登录信息时返回空,费用上不写账号。 */ + /** + * 在还有登录态的线程上取出账号和用户主键。后台重算把这两个值带过去。 + * + * @return 下标 0 是账号,下标 1 是用户主键;取不到时对应位置为空串 + */ + public static String[] capture() + { + String name = ""; + String id = ""; + try + { + LoginUser login = SecurityUtils.getLoginUser(); + if (login.getUserId() != null) + { + id = String.valueOf(login.getUserId()); + } + SysUser user = login.getUser(); + if (user != null && user.getUserName() != null && !user.getUserName().isBlank()) + { + name = user.getUserName().trim(); + } + } + catch (Exception ignored) + { + name = ""; + id = ""; + } + return new String[] { name, id }; + } + + /** 后台线程开始处理前放上提交人。空值表示这根线程不覆盖登录态。 */ + public static void bind(String name, String userId) + { + if (name == null || name.isBlank()) + { + BOUND_NAME.remove(); + } + else + { + BOUND_NAME.set(name.trim()); + } + if (userId == null || userId.isBlank()) + { + BOUND_ID.remove(); + } + else + { + BOUND_ID.set(userId.trim()); + } + } + + /** 线程归还线程池前清掉,避免下一票用到上一个人。 */ + public static void clear() + { + BOUND_NAME.remove(); + BOUND_ID.remove(); + } + + /** 操作人账号。优先用提交重算时记下的账号,没有登录信息时记 system。 */ + public static String operatorName() + { + String bound = BOUND_NAME.get(); + if (bound != null && !bound.isBlank()) + { + return bound; + } + try + { + String name = SecurityUtils.getUsername(); + if (name != null && !name.isBlank()) + { + return name; + } + } + catch (Exception ignored) + { + return "system"; + } + return "system"; + } + + /** 当前登录用户的主键。订单同步等没有登录信息时记 system,页面回显为系统自动。 */ public static String userId() { + String bound = BOUND_ID.get(); + if (bound != null && !bound.isBlank()) + { + return bound; + } try { Long id = SecurityUtils.getUserId(); - return id == null ? null : String.valueOf(id); + if (id != null) + { + return String.valueOf(id); + } } - catch (Exception ex) + catch (Exception ignored) { - return null; + return "system"; } + return "system"; } } diff --git a/bms-back/bms-system/src/main/java/com/bms/price/pay/PayOrderFeeCalculator.java b/bms-back/bms-system/src/main/java/com/bms/price/pay/PayOrderFeeCalculator.java index b5b7c345..a24de46f 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/pay/PayOrderFeeCalculator.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/pay/PayOrderFeeCalculator.java @@ -340,6 +340,7 @@ public class PayOrderFeeCalculator return null; } List linkedZoneIds = zoneGroupIds(linked, countryCode, countryName); + addRemoteZoneIds(linkedZoneIds, linked, countryCode, countryName); if (!linkedZoneIds.isEmpty()) { return decideZone(zoneNames, linkedZoneIds, postcode); @@ -363,6 +364,11 @@ public class PayOrderFeeCalculator } if (groups.isEmpty()) { + PayZoneMatcher.Decision mainland = PayZoneMatcher.resolve(zoneNames, new ArrayList<>(), postcode); + if (mainland.getZoneName() != null) + { + return mainland.getZoneName(); + } throw new ServiceException("产品「" + product.getProductName() + "」有多个地区,没有找到对应的邮编分区"); } List groupIds = new ArrayList<>(); @@ -409,7 +415,35 @@ public class PayOrderFeeCalculator } /** - * 取出用来选派送费的普通分区。偏远、附加费邮编和不可达不参与选区。 + * 偏远邮编同时用来选价卡地区。对上高地、岛屿这类邮编时走对应价格列,对不上则由大陆列承接。 + * + * @param ids 已经放入的分区组 + * @param linked 已对上的邮编组 + * @param countryCode 目的国二字码 + * @param countryName 目的国名称 + */ + private static void addRemoteZoneIds(List ids, List linked, String countryCode, String countryName) + { + if (linked == null) + { + return; + } + for (PayPostcodeGroup group : linked) + { + if (group == null || group.getGroupId() == null || ids.contains(group.getGroupId()) || !PayRemoteBook.remoteGroup(group)) + { + continue; + } + if ("FEE".equals(group.getConfigKind()) || !sameCountry(group, countryCode, countryName)) + { + continue; + } + ids.add(group.getGroupId()); + } + } + + /** + * 取出用来选派送费的普通分区。附加费邮编和不可达不参与选区。 * * @param linked 已对上的邮编组 * @param countryCode 目的国二字码 diff --git a/bms-back/bms-system/src/main/java/com/bms/price/pay/PayZoneMatcher.java b/bms-back/bms-system/src/main/java/com/bms/price/pay/PayZoneMatcher.java index d892b4f8..67d149c1 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/pay/PayZoneMatcher.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/pay/PayZoneMatcher.java @@ -110,6 +110,11 @@ public final class PayZoneMatcher } if (lines == null || lines.isEmpty()) { + String mainland = mainlandZone(zoneNames); + if (mainland != null) + { + return Decision.zone(mainland); + } return Decision.unknown(); } String bestZone = null; diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayOrderCostServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayOrderCostServiceImpl.java index 40082036..38a2df01 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayOrderCostServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayOrderCostServiceImpl.java @@ -9,7 +9,6 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import com.bms.common.enums.PaymentMesEnum; import com.bms.common.exception.ServiceException; -import com.bms.common.utils.SecurityUtils; import com.bms.masterdata.domain.ServiceChannel; import com.bms.masterdata.mapper.ServiceChannelMapper; import com.bms.price.domain.PayCostLine; @@ -149,7 +148,7 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService { throw new ServiceException(result.getMessage() == null ? PaymentMesEnum.BMS_PAY_NO_COST.getCnMes() : result.getMessage()); } - String operator = SecurityUtils.getUsername(); + String operator = operator(); PrcPayBill payBill = saveBill(bill, result, operator); saveFees(bill.getBillId(), payBill.getPayBillId(), result); String channelName = channel.getChannelName() == null ? channel.getChannelCode() : channel.getChannelName(); @@ -180,19 +179,7 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService { message = message.substring(0, 100); } - String operator = "system"; - try - { - String name = SecurityUtils.getUsername(); - if (name != null && !name.isBlank()) - { - operator = name; - } - } - catch (Exception ignored) - { - operator = "system"; - } + String operator = operator(); payBillMapper.insertMissingPayBills(List.of(billId), operator); payBillMapper.markCalcStatus(billId, 2, message, operator); } @@ -371,6 +358,7 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService return null; } List linkedZoneIds = zoneGroupIds(linked, countryCode, countryName); + addRemoteZoneIds(linkedZoneIds, linked, countryCode, countryName); if (!linkedZoneIds.isEmpty()) { return decideZone(zoneNames, linkedZoneIds, postcode); @@ -394,6 +382,11 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService } if (groups.isEmpty()) { + PayZoneMatcher.Decision mainland = PayZoneMatcher.resolve(zoneNames, new ArrayList<>(), postcode); + if (mainland.getZoneName() != null) + { + return mainland.getZoneName(); + } throw new ServiceException("产品「" + product.getProductName() + "」有多个地区,没有找到对应的邮编分区"); } List groupIds = new ArrayList<>(); @@ -440,7 +433,35 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService } /** - * 取出用来选派送费的普通分区。偏远、附加费邮编和不可达不参与选区。 + * 偏远邮编同时用来选价卡地区。对上高地、岛屿这类邮编时走对应价格列,对不上则由大陆列承接。 + * + * @param ids 已经放入的分区组 + * @param linked 已对上的邮编组 + * @param countryCode 目的国二字码 + * @param countryName 目的国名称 + */ + private static void addRemoteZoneIds(List ids, List linked, String countryCode, String countryName) + { + if (linked == null) + { + return; + } + for (PayPostcodeGroup group : linked) + { + if (group == null || group.getGroupId() == null || ids.contains(group.getGroupId()) || !PayRemoteBook.remoteGroup(group)) + { + continue; + } + if ("FEE".equals(group.getConfigKind()) || !sameCountry(group, countryCode, countryName)) + { + continue; + } + ids.add(group.getGroupId()); + } + } + + /** + * 取出用来选派送费的普通分区。附加费邮编和不可达不参与选区。 * * @param linked 已对上的邮编组 * @param countryCode 目的国二字码 @@ -732,18 +753,10 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService return text.length() <= 100 ? text : text.substring(0, 100); } - /** 当前登录人。没有登录信息时记 system。 */ + /** 当前操作人。后台重算用提交时记下的账号,没有登录信息时记 system。 */ private static String operator() { - try - { - String name = SecurityUtils.getUsername(); - return name == null || name.isBlank() ? "system" : name; - } - catch (Exception ignored) - { - return "system"; - } + return PayFeeMoney.operatorName(); } /** diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayOrderListServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayOrderListServiceImpl.java index a85c0cb4..18c005a2 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayOrderListServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayOrderListServiceImpl.java @@ -193,7 +193,8 @@ public class PayOrderListServiceImpl implements IPayOrderListService task.setTotal(task.getLines().size()); task.setPercent(task.getTotal() == 0 ? 100 : finished * 100 / task.getTotal()); payOrderRecalcAsyncRunner.save(task); - payOrderRecalcAsyncRunner.run(task.getTaskId(), SecurityContextHolder.getContext().getAuthentication()); + String[] actor = PayFeeMoney.capture(); + payOrderRecalcAsyncRunner.run(task.getTaskId(), SecurityContextHolder.getContext().getAuthentication(), actor[0], actor[1]); return task.getTaskId(); } diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java index bb7db280..9a0671d6 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java @@ -56,6 +56,7 @@ import com.bms.price.domain.PrcPayBill; import com.bms.price.domain.PrcPayBillFee; import com.bms.price.domain.PrcPriceSet; import com.bms.price.domain.PrcSurcharge; +import com.bms.price.pay.PayFeeMoney; import com.bms.price.domain.BatchAddIncomeBillFeeTask; import com.bms.price.domain.ChargeWeightImportTask; import com.bms.price.domain.vo.AddIncomeBillFeeRequest; @@ -1217,7 +1218,8 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService localRebillAsyncRunner.put(taskId, BatchAddIncomeBillFeeTask.STATUS_PENDING, 0, "queued", null, billIds.size(), 0, 0); // 完成时每批写一条 ES 操作日志(LOCAL_REBILL_DONE);失败订单写入 detail.failDetails。 - localRebillAsyncRunner.run(taskId, billIds, request); + String[] actor = PayFeeMoney.capture(); + localRebillAsyncRunner.run(taskId, billIds, request, actor[0], actor[1]); return taskId; } diff --git a/bms-back/bms-system/src/main/java/com/bms/price/task/PayOrderRecalcAsyncRunner.java b/bms-back/bms-system/src/main/java/com/bms/price/task/PayOrderRecalcAsyncRunner.java index ab284555..59e884ac 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/task/PayOrderRecalcAsyncRunner.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/task/PayOrderRecalcAsyncRunner.java @@ -22,6 +22,7 @@ import com.bms.price.domain.PayOrderCostResult; import com.bms.price.domain.PayOrderRecalcLine; import com.bms.price.domain.PayOrderRecalcTask; import com.bms.price.domain.PrcPayBillFeeLog; +import com.bms.price.pay.PayFeeMoney; import com.bms.price.service.IPayOrderListService; import com.bms.price.service.PayBillFeeLogService; @@ -48,11 +49,12 @@ public class PayOrderRecalcAsyncRunner private final Map cancelFlags = new ConcurrentHashMap<>(); @Async("threadPoolTaskExecutor") - public void run(String taskId, Authentication authentication) + public void run(String taskId, Authentication authentication, String operatorName, String operatorUserId) { SecurityContext previous = SecurityContextHolder.getContext(); List feeLogs = new ArrayList<>(); boolean drained = false; + PayFeeMoney.bind(operatorName, operatorUserId); try { if (authentication != null) @@ -156,6 +158,7 @@ public class PayOrderRecalcAsyncRunner { drain(feeLogs); } + PayFeeMoney.clear(); SecurityContextHolder.setContext(previous); cancelFlags.remove(taskId); } diff --git a/bms-back/bms-system/src/main/java/com/bms/price/task/PrcOrderBillLocalRebillAsyncRunner.java b/bms-back/bms-system/src/main/java/com/bms/price/task/PrcOrderBillLocalRebillAsyncRunner.java index 15f12f9c..639a39f6 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/task/PrcOrderBillLocalRebillAsyncRunner.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/task/PrcOrderBillLocalRebillAsyncRunner.java @@ -28,6 +28,7 @@ import com.bms.price.config.BillingProperties; import com.bms.price.domain.BatchAddIncomeBillFeeTask; import com.bms.price.domain.PrcOrderBill; import com.bms.price.domain.vo.LocalRebillRequest; +import com.bms.price.pay.PayFeeMoney; import com.bms.price.domain.vo.TmsPriceQuoteResult; import com.bms.price.enums.BillBillingFailStatus; import com.bms.price.mapper.PrcOrderBillMapper; @@ -76,11 +77,17 @@ public class PrcOrderBillLocalRebillAsyncRunner @Async("threadPoolTaskExecutor") public void run(String taskId, List billIds) { - run(taskId, billIds, null); + run(taskId, billIds, null, null, null); } @Async("threadPoolTaskExecutor") public void run(String taskId, List billIds, LocalRebillRequest request) + { + run(taskId, billIds, request, null, null); + } + + @Async("threadPoolTaskExecutor") + public void run(String taskId, List billIds, LocalRebillRequest request, String operatorName, String operatorUserId) { int total = billIds == null ? 0 : billIds.size(); AtomicInteger success = new AtomicInteger(0); @@ -115,6 +122,9 @@ public class PrcOrderBillLocalRebillAsyncRunner for (int w = 0; w < threads; w++) { workers.add(() -> { + PayFeeMoney.bind(operatorName, operatorUserId); + try + { while (!isCancelRequested(taskId)) { int i = nextIndex.getAndIncrement(); @@ -161,6 +171,11 @@ public class PrcOrderBillLocalRebillAsyncRunner } } return Boolean.FALSE; + } + finally + { + PayFeeMoney.clear(); + } }); } invokeAllQuiet(pool, workers); diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PayOrderListMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PayOrderListMapper.xml index 53c6a5ea..e15dac30 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PayOrderListMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PayOrderListMapper.xml @@ -10,13 +10,14 @@ p.customer_name as customerName, p.product_name as productName, p.country_name as countryName, + p.dest_postcode as destPostcode, p.product_floor as channelName, p.charge_weight as chargeWeight, ifnull(b.pay_total, p.pay_total) as payTotal, ifnull(nullif(trim(b.currency), ''), 'CNY') as currency, b.pay_calc_status as payCalcStatus, b.pay_calc_msg as payCalcMsg, - b.update_by as updateBy, + case when lower(trim(b.update_by)) = 'system' then '系统自动' else b.update_by end as updateBy, b.update_time as updateTime, p.biz_date as bizDate from prc_order_bill p diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeLogMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeLogMapper.xml index 20bd64c8..7dc012e3 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeLogMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeLogMapper.xml @@ -42,7 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select log_id, fee_id, bill_id, fee_name, amount, currency, before_fee_name, before_amount, before_currency, after_fee_name, after_amount, after_currency, - operation_type, remark, create_by, create_time + operation_type, remark, + case when lower(trim(create_by)) = 'system' then '系统自动' else create_by end as create_by, + create_time from prc_pay_bill_fee_log where bill_id = #{billId} order by log_id desc diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml index 93f8c205..cef59f30 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml @@ -47,29 +47,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dict_data dict on dict.dict_type = 'bms_fee_type' and dict.dict_value = f.fee_type - - ( - select case - when nullif(trim(u.nick_name), '') is not null then u.nick_name - else u.user_name - end - from sys_user u - where u.del_flag = '0' - and ( - (${column} regexp '^[0-9]+$' and u.user_id = cast(${column} as unsigned)) - or (ifnull(${column}, '') not regexp '^[0-9]+$' and u.user_name = ${column}) - ) - limit 1 - ) + + case + when lower(trim(${column})) = 'system' then '系统自动' + else ifnull(( + select case + when nullif(trim(u.nick_name), '') is not null then u.nick_name + else u.user_name + end + from sys_user u + where u.del_flag = '0' + and ( + (${column} regexp '^[0-9]+$' and u.user_id = cast(${column} as unsigned)) + or (ifnull(${column}, '') not regexp '^[0-9]+$' and u.user_name = ${column}) + ) + limit 1 + ), ${column}) + end