diff --git a/Antis.Erp.Plat/netcore/scripts/20261016_fix_ck202610150067_preship_refund.sql b/Antis.Erp.Plat/netcore/scripts/20261016_fix_ck202610150067_preship_refund.sql
new file mode 100644
index 0000000..b33b7d3
--- /dev/null
+++ b/Antis.Erp.Plat/netcore/scripts/20261016_fix_ck202610150067_preship_refund.sql
@@ -0,0 +1,32 @@
+-- 出库前部分退款仍按整单金额入账的修复
+-- 订单 6918582289239387709:车轮履带发货前已退(商家实收 19.00),只发出 EBO SE
+-- 出库单 CK202610150067 现为原价 718.00 / 实收 613.15,应改为 699.00 / 594.15
+-- 优惠 104.85 不变(718-613.15 = 699-594.15)
+-- 只改金额,不生成退货单(配件未出库,退货单会虚增库存)
+
+UPDATE wt_xsckd
+SET ydje = 699.00,
+ skje = 594.15,
+ sjssrje = 594.15,
+ ysje = 104.85,
+ skmx = '[{"skfs":"入账账户","skje":"594.15","skzh":"857098599756989701"}]',
+ bz = '出库前配件已退款,实收由613.15改为594.15'
+WHERE F_Id = 'CK202610150067'
+ AND djlx = '销售出库单'
+ AND dyddh = '6918582289239387709'
+ AND skje = 613.15;
+
+UPDATE wt_xsckd_mx
+SET dj = 594.15,
+ je = 594.15
+WHERE djbh = 'CK202610150067'
+ AND spmc = 'EBO一宝家庭迷你机器人 SE'
+ AND sl = 1
+ AND je = 613.15;
+
+UPDATE waybills
+SET MerchantIncome = 594.15
+WHERE Id = 3069
+ AND OrderId = 106760
+ AND SalesOrderId = 'CK202610150067'
+ AND MerchantIncome = 613.15;
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/DouyinSkuRefundHelper.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/DouyinSkuRefundHelper.cs
index e84516f..bd82489 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/DouyinSkuRefundHelper.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/DouyinSkuRefundHelper.cs
@@ -1347,6 +1347,27 @@ public static class DouyinSkuRefundHelper
}
///
+ /// 可发货子单优惠前金额合计(分),取子单 order_amount(行总额,不再乘件数)。
+ /// 无有效子单金额时返回 0,调用方应保留父单金额。
+ ///
+ public static long SumShippableOrderAmountFen(string? productItemsJson)
+ {
+ if (string.IsNullOrWhiteSpace(productItemsJson)) return 0;
+ long sum = 0;
+ var hasAny = false;
+ foreach (var o in ParseProductItemLines(productItemsJson))
+ {
+ if (IsRefundedItem(o) || IsRefundingItem(o)) continue;
+ if (o["is_gift"]?.Type == JTokenType.Boolean && o["is_gift"]!.Value()) continue;
+ var fen = TryParseAmountFen(o["order_amount"]);
+ if (!fen.HasValue || fen.Value <= 0) continue;
+ sum += fen.Value;
+ hasAny = true;
+ }
+ return hasAny ? sum : 0;
+ }
+
+ ///
/// 部分退款时汇总可发货子单的抖店真实商家实收(元),取自子单金额字段,不按比例折算。
///
public static decimal? ComputeShippableMerchantIncomeYuan(string? productItemsJson, decimal? totalMerchantIncomeYuan)
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/OrderService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/OrderService.cs
index dd6690c..c672cca 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/OrderService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/OrderService.cs
@@ -423,6 +423,7 @@ public class OrderService
/// 自调用站点根解析。优先级:
///
/// - 配置 DouyinLogistics:InternalApiOrigin(运维显式指定,最高优先级)
+ /// - 当前请求打到本进程的 http://127.0.0.1:LocalPort(避开反代公网 https)
/// - Kestrel 实际绑定地址(优先 http,避免线上反代 https 导致 loopback SSL 失败)
/// - 配置 DouyinLogistics:FallbackApiOrigin
/// - 当前 HTTP 请求 Scheme://Host(最后兜底)
@@ -435,7 +436,13 @@ public class OrderService
if (!string.IsNullOrWhiteSpace(internalOrigin))
return internalOrigin.Trim().TrimEnd('/');
- // 2) 从 Kestrel 实际绑定地址自动识别;优先 http,再 https
+ // 2) 当前请求打到本进程的端口。反代进来时 Scheme/Host 是公网 https,
+ // 自调用会证书失败,登录拿不到 token,自动开单被记成「缺少 ERP 鉴权」。
+ var localPort = _httpContextAccessor.HttpContext?.Connection.LocalPort ?? 0;
+ if (localPort > 0)
+ return $"http://127.0.0.1:{localPort}";
+
+ // 3) 从 Kestrel 实际绑定地址自动识别;优先 http,再 https
try
{
var addrs = _server?.Features?.Get()?.Addresses;
@@ -462,12 +469,12 @@ public class OrderService
// 忽略:启动时 addresses 可能尚未就绪
}
- // 3) 传统 fallback 配置
+ // 4) 传统 fallback 配置
var fallback = _configuration["DouyinLogistics:FallbackApiOrigin"];
if (!string.IsNullOrWhiteSpace(fallback))
return fallback.Trim().TrimEnd('/');
- // 4) 最后再用当前请求的 Scheme/Host(反代场景下可能是 https+公网域名,会触发 SSL loopback,放最后)
+ // 5) 最后再用当前请求的 Scheme/Host(反代场景下可能是 https+公网域名,会触发 SSL loopback,放最后)
var ctx = _httpContextAccessor.HttpContext;
if (ctx != null)
return $"{ctx.Request.Scheme}://{ctx.Request.Host}".TrimEnd('/');
@@ -5464,31 +5471,34 @@ public class OrderService
// 抖音订单金额(分)→ ERP 主表
// 合并订单时汇总所有子订单金额;单笔订单用自身金额
- long orderAmtFen;
- long payAmtFen;
-
+ // 出库前先拉抖店最新子单:发货前部分退款若尚未推送到本地,父单金额仍是整单,会把已退商品算进出库。
+ List amountOrders;
if (mergedOrderInternalIds != null && mergedOrderInternalIds.Count > 1)
{
- var mergedOrders = await _db.Queryable()
+ amountOrders = await _db.Queryable()
.Where(o => mergedOrderInternalIds.Contains(o.Id))
.ToListAsync();
- orderAmtFen = mergedOrders.Sum(o => o.OrderAmount ?? 0L);
- payAmtFen = mergedOrders.Sum(o => o.PayAmount ?? 0L);
- _logger.LogInformation("合并订单金额汇总: OrderIds={Ids}, OrderAmtFen={Amt}, PayAmtFen={Pay}",
- string.Join(",", mergedOrderInternalIds), orderAmtFen, payAmtFen);
}
else
{
- orderAmtFen = order.OrderAmount ?? 0L;
- payAmtFen = order.PayAmount ?? 0L;
+ amountOrders = new List { order };
+ }
+
+ await RefreshProductItemsBeforeOutboundAsync(amountOrders);
+
+ long orderAmtFen = amountOrders.Sum(o => o.OrderAmount ?? 0L);
+ long payAmtFen = amountOrders.Sum(o => o.PayAmount ?? 0L);
+ if (amountOrders.Count > 1)
+ {
+ _logger.LogInformation("合并订单金额汇总: OrderIds={Ids}, OrderAmtFen={Amt}, PayAmtFen={Pay}",
+ string.Join(",", amountOrders.Select(o => o.Id)), orderAmtFen, payAmtFen);
}
// 金额口径:
- // ydje(原价/应收)= 抖音 orderAmount
- // sjssrje(商家实际收入)= 发货单商家实际收入(可改,默认=用户支付)
+ // ydje(原价/应收)= 抖音 orderAmount;出库前已退/退款中的子单不计入
+ // sjssrje(商家实际收入)= 发货单商家实际收入(可改,默认=用户支付),不得高于可发货子单实收
// skje(收款金额)= 商家实际收入(与明细金额合计一致)
// ysje(优惠金额)= ydje − 商家实际收入
- var ydjeYuan = orderAmtFen / 100.0m;
var payAmtYuan = payAmtFen / 100.0m;
decimal sjssrjeYuan;
@@ -5500,6 +5510,25 @@ public class OrderService
sjssrjeYuan = payAmtYuan;
if (sjssrjeYuan < 0) sjssrjeYuan = 0;
+ var cappedByPreShipRefund = CapOutboundAmountsForPreShipRefund(amountOrders, ref orderAmtFen, ref sjssrjeYuan);
+ if (cappedByPreShipRefund)
+ {
+ _logger.LogInformation(
+ "出库前部分退款,出库金额改为可发货子单: OrderId={OrderId}, ydje分={YdjeFen}, 商家实收={Income}",
+ orderId, orderAmtFen, sjssrjeYuan);
+ if (waybill != null && waybill.MerchantIncome.HasValue
+ && waybill.MerchantIncome.Value > sjssrjeYuan + 0.01m)
+ {
+ waybill.MerchantIncome = sjssrjeYuan;
+ waybill.UpdateTime = DateTime.Now;
+ await _db.Updateable(waybill)
+ .UpdateColumns(w => new { w.MerchantIncome, w.UpdateTime })
+ .ExecuteCommandAsync();
+ }
+ }
+
+ var ydjeYuan = orderAmtFen / 100.0m;
+
var amountLines = DouyinXsckdAmountHelper.ToResolvedLines(resolvedItems);
DouyinXsckdAmountHelper.AllocateByMerchantIncome(amountLines, sjssrjeYuan);
DouyinXsckdAmountHelper.ApplyResolvedLines(resolvedItems, amountLines);
@@ -5821,7 +5850,8 @@ public class OrderService
? DouyinSkuRefundHelper.ResolveNextAfterSaleRefundBatch(afterSaleItems, alreadyReturnedSkje)
: null;
- var refundedAll = await ResolveRefundedReturnLinesAsync(order, original.Details, isMergedOutbound);
+ var refundedAll = await ResolveRefundedReturnLinesAsync(
+ order, original.Details, isMergedOutbound, original.Dyddh);
var refundedLines = SubtractAlreadyReturnedQty(refundedAll, existingCoverage);
decimal returnSkje;
@@ -7015,7 +7045,7 @@ public class OrderService
/// 原出库单为合并单时为 true:禁止 SKU 匹配失败时回退整单 ,仅返回能安全匹配到的行。
///
private async Task> ResolveRefundedReturnLinesAsync(
- Order order, List originalLines, bool isMergedOutbound = false)
+ Order order, List originalLines, bool isMergedOutbound = false, string? originalDyddh = null)
{
if (originalLines.Count == 0) return new List();
@@ -7088,11 +7118,113 @@ public class OrderService
result = withGifts.Select(FromReturnQtyLine).ToList();
}
+ if (result.Count == 0 && isMergedOutbound)
+ {
+ var attributed = await TryAttributeMergedRefundToUnclaimedLinesAsync(
+ order, originalLines, originalDyddh, refundedItems);
+ if (attributed.Count > 0)
+ return attributed;
+ }
+
if (result.Count == 0 && !isMergedOutbound && refundedItems.Count == items.Count)
return originalLines;
return result;
}
+ ///
+ /// 合并出库里,退款子单的抖店 SKU 对不上出库行(常见于发货时改成 ERP 商品)时,
+ /// 把仍被其他未退子单占用的出库行排除,剩下能唯一对应的行作为本子单退货行。
+ /// 禁止把其他子单的商品一起退掉。
+ ///
+ private async Task> TryAttributeMergedRefundToUnclaimedLinesAsync(
+ Order order,
+ List originalLines,
+ string? originalDyddh,
+ List refundedItems)
+ {
+ var claimed = new HashSet(StringComparer.OrdinalIgnoreCase);
+ var siblingIds = ParseDouyinOrderIdsFromDyddh(originalDyddh)
+ .Where(id => !string.Equals(id, order.OrderId, StringComparison.Ordinal))
+ .ToList();
+ if (siblingIds.Count > 0)
+ {
+ var siblings = await _db.Queryable()
+ .Where(o => siblingIds.Contains(o.OrderId))
+ .ToListAsync();
+ foreach (var sib in siblings)
+ {
+ if (sib.Status is 3 or 4)
+ continue;
+ foreach (var item in ParseProductItemsSafe(sib.ProductItems))
+ {
+ if (DouyinSkuRefundHelper.IsRefundedItem(item) || DouyinSkuRefundHelper.IsRefundingItem(item))
+ continue;
+ var skuId = ReadFirstNonEmptyString(item, "sku_id", "SkuId", "skuid", "SkuID", "skuId");
+ var outSkuId = ReadFirstNonEmptyString(item, "out_sku_id", "outSkuId", "outer_sku_id", "outerSkuId");
+ var finalSkuId = !string.IsNullOrEmpty(skuId) ? skuId : outSkuId;
+ if (string.IsNullOrEmpty(finalSkuId))
+ continue;
+ var info = await GetProductInfoByDouyinSkuAsync(finalSkuId);
+ var spbh = info?.Id?.Trim();
+ if (!string.IsNullOrEmpty(spbh))
+ claimed.Add(spbh);
+ }
+ }
+ }
+
+ var candidates = originalLines
+ .Where(l => l.Sl > 0 && (string.IsNullOrWhiteSpace(l.Spbh) || !claimed.Contains(l.Spbh)))
+ .ToList();
+ if (candidates.Count == 0)
+ return new List();
+
+ long refundFen = 0;
+ foreach (var item in refundedItems)
+ {
+ var fen = item["apply_refund_amount_fen"]?.ToObject()
+ ?? item["merchant_income_fen"]?.ToObject()
+ ?? item["pay_amount"]?.ToObject();
+ if (fen is > 0)
+ refundFen += fen.Value;
+ }
+
+ ErpSalesOrderLine? pick = null;
+ if (candidates.Count == 1)
+ {
+ pick = candidates[0];
+ }
+ else if (refundFen > 0)
+ {
+ var target = refundFen / 100m;
+ var exact = candidates.Where(c => Math.Abs(c.Je - target) <= 0.01m).ToList();
+ if (exact.Count == 1)
+ pick = exact[0];
+ }
+
+ if (pick == null)
+ return new List();
+
+ var refundQty = refundedItems.Sum(ReadProductItemNum);
+ var take = Math.Min(pick.Sl, Math.Max(refundQty, 1));
+ var je = pick.Sl > 0 ? Math.Round(pick.Je * take / pick.Sl, 2) : pick.Je;
+ _logger.LogInformation(
+ "合并出库退款子单 {DouyinOrderId} SKU 未命中出库行,改退未被其他子单占用的 {Spmc} x{Sl}",
+ order.OrderId, pick.Spmc, take);
+ return new List
+ {
+ new()
+ {
+ Spbh = pick.Spbh,
+ Sptm = pick.Sptm,
+ Spmc = pick.Spmc,
+ Sl = take,
+ Dj = pick.Dj,
+ Je = je,
+ Mdxx = pick.Mdxx
+ }
+ };
+ }
+
private static int ReadProductItemNum(JObject item)
{
var n = item["item_num"]?.ToObject() ?? item["ItemNum"]?.ToObject();
@@ -7588,12 +7720,11 @@ public class OrderService
return;
}
+ // 销售出库 Create 已 AllowAnonymous。推送/补扫没有登录态时,服务账号登录失败
+ // 不能再把整单停成「缺少 ERP 鉴权」;无 token 也继续提交。
var token = await GetErpTokenAsync();
if (string.IsNullOrWhiteSpace(token))
- {
- await RecordAutoXsckdFailureAsync(orderId, "缺少 ERP 鉴权");
- return;
- }
+ _logger.LogWarning("自动开单未取得 ERP token,改为匿名创建销售出库单: OrderId={OrderId}", orderId);
var needWaybillUpdate = false;
if (string.IsNullOrWhiteSpace(waybill.Cjck) && !string.IsNullOrWhiteSpace(shopSettings.Ck))
@@ -8208,30 +8339,129 @@ public class OrderService
private static decimal? ResolveMergedMerchantIncomeYuan(IReadOnlyList siblings, Waybill waybill)
{
+ decimal? shippable = SumShippableMerchantIncomeYuan(siblings);
if (waybill.MerchantIncome.HasValue)
- return waybill.MerchantIncome.Value;
-
- if (siblings.Count <= 1)
{
- var single = siblings[0];
- OrderPricingHelper.ApplyResolvedMerchantIncome(single);
- return OrderPricingHelper.ResolveMerchantIncomeYuan(single)
- ?? (single.PayAmount.HasValue ? single.PayAmount.Value / 100m : (decimal?)null);
+ var stored = waybill.MerchantIncome.Value;
+ var hasRefund = siblings.Any(o => DouyinSkuRefundHelper.HasAnyRefundedOrRefundingItem(o.ProductItems));
+ if (hasRefund && shippable.HasValue && stored > shippable.Value + 0.01m)
+ return shippable;
+ return stored;
}
+ return shippable;
+ }
+
+ /// 各订单可发货子单商家实收之和;没有子单退款标记时等于订单级实收。
+ private static decimal? SumShippableMerchantIncomeYuan(IReadOnlyList orders)
+ {
+ if (orders == null || orders.Count == 0) return null;
decimal sum = 0m;
var hasValue = false;
- foreach (var o in siblings)
+ foreach (var o in orders)
{
OrderPricingHelper.ApplyResolvedMerchantIncome(o);
var inc = OrderPricingHelper.ResolveMerchantIncomeYuan(o)
- ?? (o.PayAmount.HasValue ? o.PayAmount.Value / 100m : 0m);
+ ?? (o.PayAmount.HasValue ? o.PayAmount.Value / 100m : (decimal?)null);
inc = DouyinSkuRefundHelper.ComputeShippableMerchantIncomeYuan(o.ProductItems, inc) ?? inc;
- sum += inc;
+ if (!inc.HasValue) continue;
+ sum += inc.Value;
hasValue = true;
}
+ return hasValue ? Math.Round(sum, 2, MidpointRounding.AwayFromZero) : null;
+ }
- return hasValue ? sum : null;
+ ///
+ /// 生成出库单前拉取抖店子单。只回写商品明细与部分退款标记,不改订单状态,避免发货前退款把整单打成不可出库。
+ ///
+ private async Task RefreshProductItemsBeforeOutboundAsync(IReadOnlyList orders)
+ {
+ foreach (var o in orders)
+ {
+ if (o == null || !o.ShopId.HasValue || string.IsNullOrWhiteSpace(o.OrderId))
+ continue;
+ try
+ {
+ var douyinService = GetDouyinServiceForOrder(o);
+ var dy = await douyinService.GetOrderDetailAsDouyinOrderAsync(o.OrderId);
+ if (dy == null || string.IsNullOrWhiteSpace(dy.ProductItems))
+ continue;
+ var diff = TryApplyProductItemsFromDouyin(o, dy);
+ if (!diff.HasChanges)
+ continue;
+ o.UpdateTime = DateTime.Now;
+ await _db.Updateable(o)
+ .UpdateColumns(x => new
+ {
+ x.ProductItems,
+ x.OriginalProductItems,
+ x.ProductName,
+ x.ProductPic,
+ x.ProductSpec,
+ x.ItemCount,
+ x.PartialRefund,
+ x.UpdateTime
+ })
+ .ExecuteCommandAsync();
+ _logger.LogInformation(
+ "出库前已刷新抖店商品/退款: OrderId={OrderId}, {Summary}",
+ o.OrderId, diff.Summary);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogWarning(ex, "出库前刷新抖店商品失败,按本地明细计金额: OrderId={OrderId}", o.OrderId);
+ }
+ }
+ }
+
+ ///
+ /// 出库前已退款/退款中的子单不计入原价和商家实收。
+ /// 发货单或前端若仍传父单总额,这里压到可发货子单合计;手工改低的金额保持不变。
+ ///
+ private static bool CapOutboundAmountsForPreShipRefund(
+ IReadOnlyList orders,
+ ref long orderAmtFen,
+ ref decimal sjssrjeYuan)
+ {
+ if (orders == null || orders.Count == 0)
+ return false;
+ if (!orders.Any(o => DouyinSkuRefundHelper.HasAnyRefundedOrRefundingItem(o.ProductItems)))
+ return false;
+
+ long shippableFen = 0;
+ var hasOrderAmt = false;
+ foreach (var o in orders)
+ {
+ var lineFen = DouyinSkuRefundHelper.SumShippableOrderAmountFen(o.ProductItems);
+ if (lineFen > 0)
+ {
+ shippableFen += lineFen;
+ hasOrderAmt = true;
+ continue;
+ }
+
+ if (!DouyinSkuRefundHelper.HasAnyRefundedOrRefundingItem(o.ProductItems) && (o.OrderAmount ?? 0) > 0)
+ {
+ shippableFen += o.OrderAmount ?? 0L;
+ hasOrderAmt = true;
+ }
+ }
+
+ var changed = false;
+ if (hasOrderAmt && shippableFen > 0 && orderAmtFen > shippableFen)
+ {
+ orderAmtFen = shippableFen;
+ changed = true;
+ }
+
+ var shippableIncome = SumShippableMerchantIncomeYuan(orders);
+ if (shippableIncome.HasValue && sjssrjeYuan > shippableIncome.Value + 0.01m)
+ {
+ sjssrjeYuan = shippableIncome.Value;
+ changed = true;
+ }
+
+ return changed;
}
private async Task OrderHasSerialManagedProductsAsync(string? productItemsJson)
@@ -8347,16 +8577,15 @@ public class OrderService
private async Task GetErpTokenAsync()
{
var ctx = _httpContextAccessor.HttpContext;
- var raw = ctx?.Request?.Headers["Authorization"].ToString();
- if (!string.IsNullOrWhiteSpace(raw))
- {
- if (raw.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
- raw = raw.Substring("Bearer ".Length).Trim();
- return raw;
- }
+ var fromRequest = NormalizeErpBearerToken(ctx?.Request?.Headers["Authorization"].ToString());
+ // 只认真正的 JWT。空 Bearer、网关占位、抖店回调头不能当成 ERP 登录态,否则不会再走服务账号。
+ if (LooksLikeJwt(fromRequest))
+ return fromRequest;
- if (_cache.TryGetValue(ErpServiceTokenCacheKey, out string? cached) && !string.IsNullOrWhiteSpace(cached))
- return cached;
+ var cachedToken = NormalizeErpBearerToken(
+ _cache.TryGetValue(ErpServiceTokenCacheKey, out string? cached) ? cached : null);
+ if (LooksLikeJwt(cachedToken))
+ return cachedToken;
var account = (_configuration["DouyinLogistics:ErpServiceAccount"] ?? "").Trim();
var password = (_configuration["DouyinLogistics:ErpServicePassword"] ?? "").Trim();
@@ -8383,11 +8612,11 @@ public class OrderService
}
var root = JsonConvert.DeserializeObject(body);
- var token = root?["data"]?["token"]?.ToString();
+ var token = NormalizeErpBearerToken(root?["data"]?["token"]?.ToString());
if (string.IsNullOrWhiteSpace(token))
- token = root?["token"]?.ToString();
+ token = NormalizeErpBearerToken(root?["token"]?.ToString());
- if (string.IsNullOrWhiteSpace(token))
+ if (!LooksLikeJwt(token))
{
_logger.LogWarning("ERP 服务账号登录成功但未解析到 token: Body={Body}", body);
return null;
@@ -8403,6 +8632,23 @@ public class OrderService
}
}
+ /// 去掉 Bearer 前缀。登录接口返回的 token 已带 Bearer,再套一层会变成 Bearer Bearer。
+ private static string? NormalizeErpBearerToken(string? raw)
+ {
+ var token = (raw ?? "").Trim();
+ if (token.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
+ token = token.Substring("Bearer ".Length).Trim();
+ return string.IsNullOrWhiteSpace(token) ? null : token;
+ }
+
+ private static bool LooksLikeJwt(string? token)
+ {
+ if (string.IsNullOrWhiteSpace(token))
+ return false;
+ var parts = token.Split('.');
+ return parts.Length == 3 && parts.All(p => p.Length > 0);
+ }
+
///
/// 比较两份发货单 ProductInfo 是否一致(用于判断是否允许重复提交)。
///
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/NCC.Extend.Entitys.xml b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/NCC.Extend.Entitys.xml
index b5e0ad7..91168ee 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/NCC.Extend.Entitys.xml
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/NCC.Extend.Entitys.xml
@@ -6665,6 +6665,11 @@
是否享受会员权益(积分/会员折扣/优惠券等;1是0否,默认1)
+
+
+ 客户分类 Id(空则默认「门店散客」)
+
+
客户信息输出参数
@@ -6805,6 +6810,16 @@
是否享受会员权益(积分/会员折扣/优惠券等;1是0否)
+
+
+ 客户分类 Id
+
+
+
+
+ 客户分类名称(大类/子级路径)
+
+
客户信息输入参数
@@ -6920,6 +6935,16 @@
备注(租赁还卡联系等)
+
+
+ 客户分类 Id
+
+
+
+
+ 客户分类名称(大类/子级路径)
+
+
客户信息列表查询输入
@@ -7030,6 +7055,11 @@
备注关键词(模糊匹配 F_Bz,可与 bzHas 组合)
+
+
+ 客户分类 Id(含所选节点及其全部下级)
+
+
客户信息更新输入参数
@@ -7640,6 +7670,36 @@
主键
+
+
+ 客户分类级联节点(el-cascader / el-tree-select)
+
+
+
+
+ 客户分类新建/更新入参
+
+
+
+
+ 上级分类 Id,空表示大类
+
+
+
+
+ 分类名称
+
+
+
+
+ 排序序号
+
+
+
+
+ 客户分类扁平列表一行
+
+
卡卷类型管理修改输入参数
@@ -23804,6 +23864,11 @@
是否享受会员权益(积分赚取/抵扣、权益卡复购折、优惠券等;1是0否)
+
+
+ 客户分类(wt_hy_khfl.F_Id)
+
+
积分明细管理
@@ -23839,6 +23904,11 @@
积分时间
+
+
+ 客户档案分类(树形:大类-子级)
+
+
卡卷类型管理