CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
van
2026-04-08 16:36:20 +08:00
parent 2d4f933791
commit c9876df3de
5 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/JDOrderController.java
View File

@@ -1057,22 +1057,30 @@ public class JDOrderController extends BaseController {
}
try {
// 构建配置键名
String configKey = CONFIG_KEY_PREFIX + distributionMark.trim();
// 从系统配置中获取接收人列表
String trimmed = distributionMark.trim();
String configKey = CONFIG_KEY_PREFIX + trimmed;
String configValue = sysConfigService.selectConfigByKey(configKey);
if (StringUtils.hasText(configValue)) {
// 清理配置值（去除空格）
String touser = configValue.trim().replaceAll(",\\s+", ",");
logger.info("从配置获取接收人列表 - 分销标识: {}, 配置键: {}, 接收人: {}",
distributionMark, configKey, touser);
return touser;
} else {
}
if (trimmed.startsWith("F-") || "F".equals(trimmed)) {
if (!trimmed.equals("F")) {
String fallbackKey = CONFIG_KEY_PREFIX + "F";
String fallbackVal = sysConfigService.selectConfigByKey(fallbackKey);
if (StringUtils.hasText(fallbackVal)) {
String touser = fallbackVal.trim().replaceAll(",\\s+", ",");
logger.info("从配置获取接收人列表（F 系回退） - 分销标识: {}, 配置键: {}, 接收人: {}",
distributionMark, fallbackKey, touser);
return touser;
}
}
}
logger.debug("未找到接收人配置 - 分销标识: {}, 配置键: {}", distributionMark, configKey);
return null;
}
} catch (Exception e) {
logger.error("获取接收人配置失败 - 分销标识: {}, 错误: {}", distributionMark, e.getMessage(), e);
return null;

9
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java
View File

@@ -1379,7 +1379,14 @@ public class InstructionServiceImpl implements IInstructionService {
if (mark == null) {
return false;
}
return "F".equalsIgnoreCase(mark.trim());
String t = mark.trim();
if (t.isEmpty()) {
return false;
}
if ("F".equalsIgnoreCase(t)) {
return true;
}
return t.length() >= 2 && t.regionMatches(true, 0, "F-", 0, 2);
}
private static boolean isNewTemplateDanWriteSuccess(String primary) {

2
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderProfitServiceImpl.java
View File

@@ -59,7 +59,7 @@ public class JDOrderProfitServiceImpl implements IJDOrderProfitService {
return;
}
if ("F".equals(mark)) {
if ("F".equals(mark) || mark.startsWith("F-")) {
if (!sellingLocked) {
fillSellingPriceFromConfig(order);
}

24
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/LogisticsServiceImpl.java
View File

@@ -896,22 +896,32 @@ public class LogisticsServiceImpl implements ILogisticsService {
}
try {
// 构建配置键名
String configKey = CONFIG_KEY_PREFIX + distributionMark.trim();
// 从系统配置中获取接收人列表
String trimmed = distributionMark.trim();
// 构建配置键名（可与订单中的标识完全一致，如 F-王杰）
String configKey = CONFIG_KEY_PREFIX + trimmed;
String configValue = sysConfigService.selectConfigByKey(configKey);
if (StringUtils.hasText(configValue)) {
// 清理配置值（去除空格）
String touser = configValue.trim().replaceAll(",\\s+", ",");
logger.info("从配置获取接收人列表 - 分销标识: {}, 配置键: {}, 接收人: {}",
distributionMark, configKey, touser);
return touser;
} else {
}
// F、F-中文 等未单独配置时，共用 logistics.push.touser.F
if (trimmed.startsWith("F-") || "F".equals(trimmed)) {
if (!trimmed.equals("F")) {
String fallbackKey = CONFIG_KEY_PREFIX + "F";
String fallbackVal = sysConfigService.selectConfigByKey(fallbackKey);
if (StringUtils.hasText(fallbackVal)) {
String touser = fallbackVal.trim().replaceAll(",\\s+", ",");
logger.info("从配置获取接收人列表（F 系回退） - 分销标识: {}, 配置键: {}, 接收人: {}",
distributionMark, fallbackKey, touser);
return touser;
}
}
}
logger.debug("未找到接收人配置 - 分销标识: {}, 配置键: {}", distributionMark, configKey);
return null;
}
} catch (Exception e) {
logger.error("获取接收人配置失败 - 分销标识: {}, 错误: {}", distributionMark, e.getMessage(), e);
return null;

2
ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
View File

@@ -282,7 +282,7 @@
<select id="selectJDOrderListByDistributionMarkFOrPDD" resultMap="JDOrderResult">
<include refid="selectJDOrderBase"/>
<where>
(distribution_mark = 'F' OR distribution_mark = 'PDD' OR distribution_mark = 'H' OR distribution_mark = 'W' OR distribution_mark = 'PDD-W')
(distribution_mark = 'F' OR distribution_mark LIKE 'F-%' OR distribution_mark = 'PDD' OR distribution_mark = 'H' OR distribution_mark = 'W' OR distribution_mark = 'PDD-W')
AND logistics_link IS NOT NULL
AND logistics_link != ''
AND create_time >= DATE_SUB(NOW(), INTERVAL 30 DAY)