From b35b03bb052273e6795975f39d3e470e4fd584d8 Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Thu, 24 Sep 2026 17:41:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...态查询接口说明.md => TMS订单额度欠费状态和客户状态查询接口文档.md} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename bms-back/doc/{TMS订单额度欠费状态和客户状态查询接口说明.md => TMS订单额度欠费状态和客户状态查询接口文档.md} (97%) diff --git a/bms-back/doc/TMS订单额度欠费状态和客户状态查询接口说明.md b/bms-back/doc/TMS订单额度欠费状态和客户状态查询接口文档.md similarity index 97% rename from bms-back/doc/TMS订单额度欠费状态和客户状态查询接口说明.md rename to bms-back/doc/TMS订单额度欠费状态和客户状态查询接口文档.md index 90a30b57..0d7457aa 100644 --- a/bms-back/doc/TMS订单额度欠费状态和客户状态查询接口说明.md +++ b/bms-back/doc/TMS订单额度欠费状态和客户状态查询接口文档.md @@ -2,7 +2,7 @@ ## 1. 接口用途 -TMS 根据订单号、运单号或转单号查询 BMS 中的订单计费记录，并获取该订单关联客户的当前启用状态和订单计费记录中的欠费状态快照。 +TMS 根据订单号、运单号或转单号查询 BMS 中的订单计费记录，并获取该订单关联客户的当前启用状态和订单计费记录中的欠费状态快照。其他字段返回用于TMS辅助判断。 ## 2. 基本信息 @@ -11,13 +11,13 @@ TMS 根据订单号、运单号或转单号查询 BMS 中的订单计费记录 |---|---| | 请求方式 | `GET` | | 请求地址 | `/api/tms/order-bill/status` | -| 完整地址示例 | `http://{BMS_HOST}:{PORT}/api/tms/order-bill/status` | +| 完整地址示例 | `https://bms.lionquexpress.com/prod-api/api/tms/order-bill/status` | | 登录要求 | 不需要登录 Token | | 接口鉴权 | 必须携带请求头 `X-Api-Code` | | 字符编码 | UTF-8 | | 响应格式 | JSON | -> `X-Api-Code` = BMS.TMS.ZYaOvlQzpcfau8TUaCFfO3Hp8ieHIqGw。 +> `X-Api-Code` = BMS.TMS.ZYaOvlQzpcfau8TUaCFfO3Hp8ieHIqGw ## 3. 请求参数 From 9292199ca1041acadd7528dc8562cca46d8654ed Mon Sep 17 00:00:00 2001 From: wuweihua <88888888> Date: Thu, 24 Sep 2026 18:02:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E8=B4=B9?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/i18n/messages.properties | 2 ++ .../service/impl/TmsPriceQuoteServiceImpl.java | 15 +++++++++++++-- bms-front/src/views/price/billing/quote.vue | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/bms-back/ruoyi-admin/src/main/resources/i18n/messages.properties b/bms-back/ruoyi-admin/src/main/resources/i18n/messages.properties index 7e4b34e3..7a70d8cc 100644 --- a/bms-back/ruoyi-admin/src/main/resources/i18n/messages.properties +++ b/bms-back/ruoyi-admin/src/main/resources/i18n/messages.properties @@ -143,6 +143,7 @@ price.quote.weightInvalid=重量必须大于0 price.quote.bizDateInvalid=业务日期格式必须为yyyy-MM-dd price.quote.fixedPackageNoDetails=套餐固定价格没有明细，使用产品默认价格 price.quote.noCustomerPackageOverride=没有客户套餐覆盖，使用产品默认运费/挂号费 +price.quote.noCustomerPackage=客户未绑定套餐，无法试算 price.quote.quoteIdRequired=报价ID为空 price.quote.hitCustomerFixedPackageDetail=命中客户套餐固定价格明细 @@ -153,6 +154,7 @@ price.bill.notFound=计费记录不存在 price.bill.customerRequired=订单同步缺少有效客户 price.bill.alreadyInArBill=订单{0}已生成应收账单，作废后方可重新计费 price.bill.bizDateRequired=业务日期为空 +price.bill.noCustomerPackage=客户未绑定套餐，无法计费 price.bill.fee.scIdRequired=附加费不能为空 price.bill.fee.surchargeNotFound=附加费配置不存在或已停用 price.bill.fee.notFound=费用明细不存在 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/TmsPriceQuoteServiceImpl.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/TmsPriceQuoteServiceImpl.java index 39772436..7659bb3a 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/TmsPriceQuoteServiceImpl.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/TmsPriceQuoteServiceImpl.java @@ -56,8 +56,9 @@ import com.ruoyi.price.search.IBillSearchStore; import com.ruoyi.price.service.ITmsPriceQuoteService; /** - * Shared quote/bill calc: bound set + active version by bizDate, else product default. - * Quote persists prc_quote; bill path calls calculate() then persists prc_order_bill. + * Shared quote/bill calc: bound set + active version by bizDate. + * No customer package bind: quote and bill both fail hard (no PRODUCT_DEFAULT). + * Bill path: no persist; billing task marked FAILED (abnormal order). * * @author ruoyi */ @@ -307,6 +308,16 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService } } + // No customer package bind: do not use PRODUCT_DEFAULT (quote and bill). + // Bill: no persist; billing task catches and writes success_status=FAILED. + if (binds == null || binds.isEmpty()) + { + String msgKey = request instanceof TmsPriceBillRequest + ? "price.bill.noCustomerPackage" + : "price.quote.noCustomerPackage"; + throw new ServiceException(MessageUtils.message(msgKey)); + } + TmsPriceQuoteResult fallback = buildDefault(request.getCustomerId(), base, productCode, productName, weight, MessageUtils.message("price.quote.noCustomerPackageOverride")); stampRequestMeta(request, fallback); diff --git a/bms-front/src/views/price/billing/quote.vue b/bms-front/src/views/price/billing/quote.vue index 20510ace..9f582d05 100644 --- a/bms-front/src/views/price/billing/quote.vue +++ b/bms-front/src/views/price/billing/quote.vue @@ -7,7 +7,7 @@ -
与套餐绑定客户一致；无套餐时走产品默认价
+
与套餐绑定客户一致；未绑定套餐时报错