wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新计费失败状态，新增销售价和产品价未匹配的错误信息，调整相关代码逻辑以支持新的状态处理。

Browse Source
This commit is contained in:
wuweihua
2026-10-27 15:24:16 +08:00
parent 0ba975656b
commit 4d4065b9e9
14 changed files with 189 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/bms-admin/src/main/java/com/bms/web/controller/price/BillingController.java
+4 -1
View File
@@ -195,7 +195,10 @@ public class BillingController extends BaseController
private static List<Integer> limitBillingListFailStatus(List<Integer> requested)
{
List<Integer> allowed = Arrays.asList(Integer.valueOf(0), Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3));
// Soft-fail list: success + sales 1/2/3 + product-catalog 23/24/25
List<Integer> allowed = Arrays.asList(
Integer.valueOf(0), Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3),
Integer.valueOf(23), Integer.valueOf(24), Integer.valueOf(25));
if (requested == null || requested.isEmpty())
{
return new ArrayList<Integer>(allowed);
bms-back/bms-admin/src/main/resources/i18n/messages.properties
+6 -3
View File
@@ -216,9 +216,12 @@ price.set.detail.duplicate.fixed=产品{0} 国家{1} 重量段{2} {3}（共{4}
price.set.detail.duplicate.discount=产品{0}（共{1}条）
price.set.detail.duplicate.hasZone=有分区({0})
price.set.detail.duplicate.noZone=无分区
price.bill.billingFail.product=计费失败：未匹配产品
price.bill.billingFail.country=计费失败：未匹配国家
price.bill.billingFail.weight=计费失败：未匹配重量段
price.bill.billingFail.product=计费失败：销售价未匹配产品
price.bill.billingFail.country=计费失败：销售价未匹配国家
price.bill.billingFail.weight=计费失败：销售价未匹配重量段
price.bill.billingFail.catalogProduct=计费失败：产品价未匹配产品
price.bill.billingFail.catalogCountry=计费失败：产品价未匹配国家
price.bill.billingFail.catalogWeight=计费失败：产品价未匹配重量段
price.bill.export.filterRequired=请先设置列表查询条件后再导出
price.bill.export.taskNotExists=导出任务不存在或已过期
price.bill.export.tooMany=匹配订单超过上限 {0} 条，请缩小筛选范围