Commit bed209a281a030fbc838eff221c055aff8db2d13
1 parent
f3bc5342
1
Showing
4 changed files
with
414 additions
and
45 deletions
Antis.Erp.Plat/netcore/scripts/20261016_fix_ck202610150067_preship_refund.sql
0 → 100644
| 1 | +-- 出库前部分退款仍按整单金额入账的修复 | ||
| 2 | +-- 订单 6918582289239387709:车轮履带发货前已退(商家实收 19.00),只发出 EBO SE | ||
| 3 | +-- 出库单 CK202610150067 现为原价 718.00 / 实收 613.15,应改为 699.00 / 594.15 | ||
| 4 | +-- 优惠 104.85 不变(718-613.15 = 699-594.15) | ||
| 5 | +-- 只改金额,不生成退货单(配件未出库,退货单会虚增库存) | ||
| 6 | + | ||
| 7 | +UPDATE wt_xsckd | ||
| 8 | +SET ydje = 699.00, | ||
| 9 | + skje = 594.15, | ||
| 10 | + sjssrje = 594.15, | ||
| 11 | + ysje = 104.85, | ||
| 12 | + skmx = '[{"skfs":"入账账户","skje":"594.15","skzh":"857098599756989701"}]', | ||
| 13 | + bz = '出库前配件已退款,实收由613.15改为594.15' | ||
| 14 | +WHERE F_Id = 'CK202610150067' | ||
| 15 | + AND djlx = '销售出库单' | ||
| 16 | + AND dyddh = '6918582289239387709' | ||
| 17 | + AND skje = 613.15; | ||
| 18 | + | ||
| 19 | +UPDATE wt_xsckd_mx | ||
| 20 | +SET dj = 594.15, | ||
| 21 | + je = 594.15 | ||
| 22 | +WHERE djbh = 'CK202610150067' | ||
| 23 | + AND spmc = 'EBO一宝家庭迷你机器人 SE' | ||
| 24 | + AND sl = 1 | ||
| 25 | + AND je = 613.15; | ||
| 26 | + | ||
| 27 | +UPDATE waybills | ||
| 28 | +SET MerchantIncome = 594.15 | ||
| 29 | +WHERE Id = 3069 | ||
| 30 | + AND OrderId = 106760 | ||
| 31 | + AND SalesOrderId = 'CK202610150067' | ||
| 32 | + AND MerchantIncome = 613.15; |
Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/DouyinSkuRefundHelper.cs
| @@ -1347,6 +1347,27 @@ public static class DouyinSkuRefundHelper | @@ -1347,6 +1347,27 @@ public static class DouyinSkuRefundHelper | ||
| 1347 | } | 1347 | } |
| 1348 | 1348 | ||
| 1349 | /// <summary> | 1349 | /// <summary> |
| 1350 | + /// 可发货子单优惠前金额合计(分),取子单 order_amount(行总额,不再乘件数)。 | ||
| 1351 | + /// 无有效子单金额时返回 0,调用方应保留父单金额。 | ||
| 1352 | + /// </summary> | ||
| 1353 | + public static long SumShippableOrderAmountFen(string? productItemsJson) | ||
| 1354 | + { | ||
| 1355 | + if (string.IsNullOrWhiteSpace(productItemsJson)) return 0; | ||
| 1356 | + long sum = 0; | ||
| 1357 | + var hasAny = false; | ||
| 1358 | + foreach (var o in ParseProductItemLines(productItemsJson)) | ||
| 1359 | + { | ||
| 1360 | + if (IsRefundedItem(o) || IsRefundingItem(o)) continue; | ||
| 1361 | + if (o["is_gift"]?.Type == JTokenType.Boolean && o["is_gift"]!.Value<bool>()) continue; | ||
| 1362 | + var fen = TryParseAmountFen(o["order_amount"]); | ||
| 1363 | + if (!fen.HasValue || fen.Value <= 0) continue; | ||
| 1364 | + sum += fen.Value; | ||
| 1365 | + hasAny = true; | ||
| 1366 | + } | ||
| 1367 | + return hasAny ? sum : 0; | ||
| 1368 | + } | ||
| 1369 | + | ||
| 1370 | + /// <summary> | ||
| 1350 | /// 部分退款时汇总可发货子单的抖店真实商家实收(元),取自子单金额字段,不按比例折算。 | 1371 | /// 部分退款时汇总可发货子单的抖店真实商家实收(元),取自子单金额字段,不按比例折算。 |
| 1351 | /// </summary> | 1372 | /// </summary> |
| 1352 | public static decimal? ComputeShippableMerchantIncomeYuan(string? productItemsJson, decimal? totalMerchantIncomeYuan) | 1373 | public static decimal? ComputeShippableMerchantIncomeYuan(string? productItemsJson, decimal? totalMerchantIncomeYuan) |
Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/OrderService.cs
| @@ -423,6 +423,7 @@ public class OrderService | @@ -423,6 +423,7 @@ public class OrderService | ||
| 423 | /// 自调用站点根解析。优先级: | 423 | /// 自调用站点根解析。优先级: |
| 424 | /// <list type="number"> | 424 | /// <list type="number"> |
| 425 | /// <item>配置 <c>DouyinLogistics:InternalApiOrigin</c>(运维显式指定,最高优先级)</item> | 425 | /// <item>配置 <c>DouyinLogistics:InternalApiOrigin</c>(运维显式指定,最高优先级)</item> |
| 426 | + /// <item>当前请求打到本进程的 <c>http://127.0.0.1:LocalPort</c>(避开反代公网 https)</item> | ||
| 426 | /// <item>Kestrel 实际绑定地址(优先 http,避免线上反代 https 导致 loopback SSL 失败)</item> | 427 | /// <item>Kestrel 实际绑定地址(优先 http,避免线上反代 https 导致 loopback SSL 失败)</item> |
| 427 | /// <item>配置 <c>DouyinLogistics:FallbackApiOrigin</c></item> | 428 | /// <item>配置 <c>DouyinLogistics:FallbackApiOrigin</c></item> |
| 428 | /// <item>当前 HTTP 请求 <c>Scheme://Host</c>(最后兜底)</item> | 429 | /// <item>当前 HTTP 请求 <c>Scheme://Host</c>(最后兜底)</item> |
| @@ -435,7 +436,13 @@ public class OrderService | @@ -435,7 +436,13 @@ public class OrderService | ||
| 435 | if (!string.IsNullOrWhiteSpace(internalOrigin)) | 436 | if (!string.IsNullOrWhiteSpace(internalOrigin)) |
| 436 | return internalOrigin.Trim().TrimEnd('/'); | 437 | return internalOrigin.Trim().TrimEnd('/'); |
| 437 | 438 | ||
| 438 | - // 2) 从 Kestrel 实际绑定地址自动识别;优先 http,再 https | 439 | + // 2) 当前请求打到本进程的端口。反代进来时 Scheme/Host 是公网 https, |
| 440 | + // 自调用会证书失败,登录拿不到 token,自动开单被记成「缺少 ERP 鉴权」。 | ||
| 441 | + var localPort = _httpContextAccessor.HttpContext?.Connection.LocalPort ?? 0; | ||
| 442 | + if (localPort > 0) | ||
| 443 | + return $"http://127.0.0.1:{localPort}"; | ||
| 444 | + | ||
| 445 | + // 3) 从 Kestrel 实际绑定地址自动识别;优先 http,再 https | ||
| 439 | try | 446 | try |
| 440 | { | 447 | { |
| 441 | var addrs = _server?.Features?.Get<IServerAddressesFeature>()?.Addresses; | 448 | var addrs = _server?.Features?.Get<IServerAddressesFeature>()?.Addresses; |
| @@ -462,12 +469,12 @@ public class OrderService | @@ -462,12 +469,12 @@ public class OrderService | ||
| 462 | // 忽略:启动时 addresses 可能尚未就绪 | 469 | // 忽略:启动时 addresses 可能尚未就绪 |
| 463 | } | 470 | } |
| 464 | 471 | ||
| 465 | - // 3) 传统 fallback 配置 | 472 | + // 4) 传统 fallback 配置 |
| 466 | var fallback = _configuration["DouyinLogistics:FallbackApiOrigin"]; | 473 | var fallback = _configuration["DouyinLogistics:FallbackApiOrigin"]; |
| 467 | if (!string.IsNullOrWhiteSpace(fallback)) | 474 | if (!string.IsNullOrWhiteSpace(fallback)) |
| 468 | return fallback.Trim().TrimEnd('/'); | 475 | return fallback.Trim().TrimEnd('/'); |
| 469 | 476 | ||
| 470 | - // 4) 最后再用当前请求的 Scheme/Host(反代场景下可能是 https+公网域名,会触发 SSL loopback,放最后) | 477 | + // 5) 最后再用当前请求的 Scheme/Host(反代场景下可能是 https+公网域名,会触发 SSL loopback,放最后) |
| 471 | var ctx = _httpContextAccessor.HttpContext; | 478 | var ctx = _httpContextAccessor.HttpContext; |
| 472 | if (ctx != null) | 479 | if (ctx != null) |
| 473 | return $"{ctx.Request.Scheme}://{ctx.Request.Host}".TrimEnd('/'); | 480 | return $"{ctx.Request.Scheme}://{ctx.Request.Host}".TrimEnd('/'); |
| @@ -5464,31 +5471,34 @@ public class OrderService | @@ -5464,31 +5471,34 @@ public class OrderService | ||
| 5464 | 5471 | ||
| 5465 | // 抖音订单金额(分)→ ERP 主表 | 5472 | // 抖音订单金额(分)→ ERP 主表 |
| 5466 | // 合并订单时汇总所有子订单金额;单笔订单用自身金额 | 5473 | // 合并订单时汇总所有子订单金额;单笔订单用自身金额 |
| 5467 | - long orderAmtFen; | ||
| 5468 | - long payAmtFen; | ||
| 5469 | - | 5474 | + // 出库前先拉抖店最新子单:发货前部分退款若尚未推送到本地,父单金额仍是整单,会把已退商品算进出库。 |
| 5475 | + List<Order> amountOrders; | ||
| 5470 | if (mergedOrderInternalIds != null && mergedOrderInternalIds.Count > 1) | 5476 | if (mergedOrderInternalIds != null && mergedOrderInternalIds.Count > 1) |
| 5471 | { | 5477 | { |
| 5472 | - var mergedOrders = await _db.Queryable<Order>() | 5478 | + amountOrders = await _db.Queryable<Order>() |
| 5473 | .Where(o => mergedOrderInternalIds.Contains(o.Id)) | 5479 | .Where(o => mergedOrderInternalIds.Contains(o.Id)) |
| 5474 | .ToListAsync(); | 5480 | .ToListAsync(); |
| 5475 | - orderAmtFen = mergedOrders.Sum(o => o.OrderAmount ?? 0L); | ||
| 5476 | - payAmtFen = mergedOrders.Sum(o => o.PayAmount ?? 0L); | ||
| 5477 | - _logger.LogInformation("合并订单金额汇总: OrderIds={Ids}, OrderAmtFen={Amt}, PayAmtFen={Pay}", | ||
| 5478 | - string.Join(",", mergedOrderInternalIds), orderAmtFen, payAmtFen); | ||
| 5479 | } | 5481 | } |
| 5480 | else | 5482 | else |
| 5481 | { | 5483 | { |
| 5482 | - orderAmtFen = order.OrderAmount ?? 0L; | ||
| 5483 | - payAmtFen = order.PayAmount ?? 0L; | 5484 | + amountOrders = new List<Order> { order }; |
| 5485 | + } | ||
| 5486 | + | ||
| 5487 | + await RefreshProductItemsBeforeOutboundAsync(amountOrders); | ||
| 5488 | + | ||
| 5489 | + long orderAmtFen = amountOrders.Sum(o => o.OrderAmount ?? 0L); | ||
| 5490 | + long payAmtFen = amountOrders.Sum(o => o.PayAmount ?? 0L); | ||
| 5491 | + if (amountOrders.Count > 1) | ||
| 5492 | + { | ||
| 5493 | + _logger.LogInformation("合并订单金额汇总: OrderIds={Ids}, OrderAmtFen={Amt}, PayAmtFen={Pay}", | ||
| 5494 | + string.Join(",", amountOrders.Select(o => o.Id)), orderAmtFen, payAmtFen); | ||
| 5484 | } | 5495 | } |
| 5485 | 5496 | ||
| 5486 | // 金额口径: | 5497 | // 金额口径: |
| 5487 | - // ydje(原价/应收)= 抖音 orderAmount | ||
| 5488 | - // sjssrje(商家实际收入)= 发货单商家实际收入(可改,默认=用户支付) | 5498 | + // ydje(原价/应收)= 抖音 orderAmount;出库前已退/退款中的子单不计入 |
| 5499 | + // sjssrje(商家实际收入)= 发货单商家实际收入(可改,默认=用户支付),不得高于可发货子单实收 | ||
| 5489 | // skje(收款金额)= 商家实际收入(与明细金额合计一致) | 5500 | // skje(收款金额)= 商家实际收入(与明细金额合计一致) |
| 5490 | // ysje(优惠金额)= ydje − 商家实际收入 | 5501 | // ysje(优惠金额)= ydje − 商家实际收入 |
| 5491 | - var ydjeYuan = orderAmtFen / 100.0m; | ||
| 5492 | var payAmtYuan = payAmtFen / 100.0m; | 5502 | var payAmtYuan = payAmtFen / 100.0m; |
| 5493 | 5503 | ||
| 5494 | decimal sjssrjeYuan; | 5504 | decimal sjssrjeYuan; |
| @@ -5500,6 +5510,25 @@ public class OrderService | @@ -5500,6 +5510,25 @@ public class OrderService | ||
| 5500 | sjssrjeYuan = payAmtYuan; | 5510 | sjssrjeYuan = payAmtYuan; |
| 5501 | if (sjssrjeYuan < 0) sjssrjeYuan = 0; | 5511 | if (sjssrjeYuan < 0) sjssrjeYuan = 0; |
| 5502 | 5512 | ||
| 5513 | + var cappedByPreShipRefund = CapOutboundAmountsForPreShipRefund(amountOrders, ref orderAmtFen, ref sjssrjeYuan); | ||
| 5514 | + if (cappedByPreShipRefund) | ||
| 5515 | + { | ||
| 5516 | + _logger.LogInformation( | ||
| 5517 | + "出库前部分退款,出库金额改为可发货子单: OrderId={OrderId}, ydje分={YdjeFen}, 商家实收={Income}", | ||
| 5518 | + orderId, orderAmtFen, sjssrjeYuan); | ||
| 5519 | + if (waybill != null && waybill.MerchantIncome.HasValue | ||
| 5520 | + && waybill.MerchantIncome.Value > sjssrjeYuan + 0.01m) | ||
| 5521 | + { | ||
| 5522 | + waybill.MerchantIncome = sjssrjeYuan; | ||
| 5523 | + waybill.UpdateTime = DateTime.Now; | ||
| 5524 | + await _db.Updateable(waybill) | ||
| 5525 | + .UpdateColumns(w => new { w.MerchantIncome, w.UpdateTime }) | ||
| 5526 | + .ExecuteCommandAsync(); | ||
| 5527 | + } | ||
| 5528 | + } | ||
| 5529 | + | ||
| 5530 | + var ydjeYuan = orderAmtFen / 100.0m; | ||
| 5531 | + | ||
| 5503 | var amountLines = DouyinXsckdAmountHelper.ToResolvedLines(resolvedItems); | 5532 | var amountLines = DouyinXsckdAmountHelper.ToResolvedLines(resolvedItems); |
| 5504 | DouyinXsckdAmountHelper.AllocateByMerchantIncome(amountLines, sjssrjeYuan); | 5533 | DouyinXsckdAmountHelper.AllocateByMerchantIncome(amountLines, sjssrjeYuan); |
| 5505 | DouyinXsckdAmountHelper.ApplyResolvedLines(resolvedItems, amountLines); | 5534 | DouyinXsckdAmountHelper.ApplyResolvedLines(resolvedItems, amountLines); |
| @@ -5821,7 +5850,8 @@ public class OrderService | @@ -5821,7 +5850,8 @@ public class OrderService | ||
| 5821 | ? DouyinSkuRefundHelper.ResolveNextAfterSaleRefundBatch(afterSaleItems, alreadyReturnedSkje) | 5850 | ? DouyinSkuRefundHelper.ResolveNextAfterSaleRefundBatch(afterSaleItems, alreadyReturnedSkje) |
| 5822 | : null; | 5851 | : null; |
| 5823 | 5852 | ||
| 5824 | - var refundedAll = await ResolveRefundedReturnLinesAsync(order, original.Details, isMergedOutbound); | 5853 | + var refundedAll = await ResolveRefundedReturnLinesAsync( |
| 5854 | + order, original.Details, isMergedOutbound, original.Dyddh); | ||
| 5825 | var refundedLines = SubtractAlreadyReturnedQty(refundedAll, existingCoverage); | 5855 | var refundedLines = SubtractAlreadyReturnedQty(refundedAll, existingCoverage); |
| 5826 | 5856 | ||
| 5827 | decimal returnSkje; | 5857 | decimal returnSkje; |
| @@ -7015,7 +7045,7 @@ public class OrderService | @@ -7015,7 +7045,7 @@ public class OrderService | ||
| 7015 | /// 原出库单为合并单时为 true:禁止 SKU 匹配失败时回退整单 <paramref name="originalLines"/>,仅返回能安全匹配到的行。 | 7045 | /// 原出库单为合并单时为 true:禁止 SKU 匹配失败时回退整单 <paramref name="originalLines"/>,仅返回能安全匹配到的行。 |
| 7016 | /// </param> | 7046 | /// </param> |
| 7017 | private async Task<List<ErpSalesOrderLine>> ResolveRefundedReturnLinesAsync( | 7047 | private async Task<List<ErpSalesOrderLine>> ResolveRefundedReturnLinesAsync( |
| 7018 | - Order order, List<ErpSalesOrderLine> originalLines, bool isMergedOutbound = false) | 7048 | + Order order, List<ErpSalesOrderLine> originalLines, bool isMergedOutbound = false, string? originalDyddh = null) |
| 7019 | { | 7049 | { |
| 7020 | if (originalLines.Count == 0) return new List<ErpSalesOrderLine>(); | 7050 | if (originalLines.Count == 0) return new List<ErpSalesOrderLine>(); |
| 7021 | 7051 | ||
| @@ -7088,11 +7118,113 @@ public class OrderService | @@ -7088,11 +7118,113 @@ public class OrderService | ||
| 7088 | result = withGifts.Select(FromReturnQtyLine).ToList(); | 7118 | result = withGifts.Select(FromReturnQtyLine).ToList(); |
| 7089 | } | 7119 | } |
| 7090 | 7120 | ||
| 7121 | + if (result.Count == 0 && isMergedOutbound) | ||
| 7122 | + { | ||
| 7123 | + var attributed = await TryAttributeMergedRefundToUnclaimedLinesAsync( | ||
| 7124 | + order, originalLines, originalDyddh, refundedItems); | ||
| 7125 | + if (attributed.Count > 0) | ||
| 7126 | + return attributed; | ||
| 7127 | + } | ||
| 7128 | + | ||
| 7091 | if (result.Count == 0 && !isMergedOutbound && refundedItems.Count == items.Count) | 7129 | if (result.Count == 0 && !isMergedOutbound && refundedItems.Count == items.Count) |
| 7092 | return originalLines; | 7130 | return originalLines; |
| 7093 | return result; | 7131 | return result; |
| 7094 | } | 7132 | } |
| 7095 | 7133 | ||
| 7134 | + /// <summary> | ||
| 7135 | + /// 合并出库里,退款子单的抖店 SKU 对不上出库行(常见于发货时改成 ERP 商品)时, | ||
| 7136 | + /// 把仍被其他未退子单占用的出库行排除,剩下能唯一对应的行作为本子单退货行。 | ||
| 7137 | + /// 禁止把其他子单的商品一起退掉。 | ||
| 7138 | + /// </summary> | ||
| 7139 | + private async Task<List<ErpSalesOrderLine>> TryAttributeMergedRefundToUnclaimedLinesAsync( | ||
| 7140 | + Order order, | ||
| 7141 | + List<ErpSalesOrderLine> originalLines, | ||
| 7142 | + string? originalDyddh, | ||
| 7143 | + List<JObject> refundedItems) | ||
| 7144 | + { | ||
| 7145 | + var claimed = new HashSet<string>(StringComparer.OrdinalIgnoreCase); | ||
| 7146 | + var siblingIds = ParseDouyinOrderIdsFromDyddh(originalDyddh) | ||
| 7147 | + .Where(id => !string.Equals(id, order.OrderId, StringComparison.Ordinal)) | ||
| 7148 | + .ToList(); | ||
| 7149 | + if (siblingIds.Count > 0) | ||
| 7150 | + { | ||
| 7151 | + var siblings = await _db.Queryable<Order>() | ||
| 7152 | + .Where(o => siblingIds.Contains(o.OrderId)) | ||
| 7153 | + .ToListAsync(); | ||
| 7154 | + foreach (var sib in siblings) | ||
| 7155 | + { | ||
| 7156 | + if (sib.Status is 3 or 4) | ||
| 7157 | + continue; | ||
| 7158 | + foreach (var item in ParseProductItemsSafe(sib.ProductItems)) | ||
| 7159 | + { | ||
| 7160 | + if (DouyinSkuRefundHelper.IsRefundedItem(item) || DouyinSkuRefundHelper.IsRefundingItem(item)) | ||
| 7161 | + continue; | ||
| 7162 | + var skuId = ReadFirstNonEmptyString(item, "sku_id", "SkuId", "skuid", "SkuID", "skuId"); | ||
| 7163 | + var outSkuId = ReadFirstNonEmptyString(item, "out_sku_id", "outSkuId", "outer_sku_id", "outerSkuId"); | ||
| 7164 | + var finalSkuId = !string.IsNullOrEmpty(skuId) ? skuId : outSkuId; | ||
| 7165 | + if (string.IsNullOrEmpty(finalSkuId)) | ||
| 7166 | + continue; | ||
| 7167 | + var info = await GetProductInfoByDouyinSkuAsync(finalSkuId); | ||
| 7168 | + var spbh = info?.Id?.Trim(); | ||
| 7169 | + if (!string.IsNullOrEmpty(spbh)) | ||
| 7170 | + claimed.Add(spbh); | ||
| 7171 | + } | ||
| 7172 | + } | ||
| 7173 | + } | ||
| 7174 | + | ||
| 7175 | + var candidates = originalLines | ||
| 7176 | + .Where(l => l.Sl > 0 && (string.IsNullOrWhiteSpace(l.Spbh) || !claimed.Contains(l.Spbh))) | ||
| 7177 | + .ToList(); | ||
| 7178 | + if (candidates.Count == 0) | ||
| 7179 | + return new List<ErpSalesOrderLine>(); | ||
| 7180 | + | ||
| 7181 | + long refundFen = 0; | ||
| 7182 | + foreach (var item in refundedItems) | ||
| 7183 | + { | ||
| 7184 | + var fen = item["apply_refund_amount_fen"]?.ToObject<long?>() | ||
| 7185 | + ?? item["merchant_income_fen"]?.ToObject<long?>() | ||
| 7186 | + ?? item["pay_amount"]?.ToObject<long?>(); | ||
| 7187 | + if (fen is > 0) | ||
| 7188 | + refundFen += fen.Value; | ||
| 7189 | + } | ||
| 7190 | + | ||
| 7191 | + ErpSalesOrderLine? pick = null; | ||
| 7192 | + if (candidates.Count == 1) | ||
| 7193 | + { | ||
| 7194 | + pick = candidates[0]; | ||
| 7195 | + } | ||
| 7196 | + else if (refundFen > 0) | ||
| 7197 | + { | ||
| 7198 | + var target = refundFen / 100m; | ||
| 7199 | + var exact = candidates.Where(c => Math.Abs(c.Je - target) <= 0.01m).ToList(); | ||
| 7200 | + if (exact.Count == 1) | ||
| 7201 | + pick = exact[0]; | ||
| 7202 | + } | ||
| 7203 | + | ||
| 7204 | + if (pick == null) | ||
| 7205 | + return new List<ErpSalesOrderLine>(); | ||
| 7206 | + | ||
| 7207 | + var refundQty = refundedItems.Sum(ReadProductItemNum); | ||
| 7208 | + var take = Math.Min(pick.Sl, Math.Max(refundQty, 1)); | ||
| 7209 | + var je = pick.Sl > 0 ? Math.Round(pick.Je * take / pick.Sl, 2) : pick.Je; | ||
| 7210 | + _logger.LogInformation( | ||
| 7211 | + "合并出库退款子单 {DouyinOrderId} SKU 未命中出库行,改退未被其他子单占用的 {Spmc} x{Sl}", | ||
| 7212 | + order.OrderId, pick.Spmc, take); | ||
| 7213 | + return new List<ErpSalesOrderLine> | ||
| 7214 | + { | ||
| 7215 | + new() | ||
| 7216 | + { | ||
| 7217 | + Spbh = pick.Spbh, | ||
| 7218 | + Sptm = pick.Sptm, | ||
| 7219 | + Spmc = pick.Spmc, | ||
| 7220 | + Sl = take, | ||
| 7221 | + Dj = pick.Dj, | ||
| 7222 | + Je = je, | ||
| 7223 | + Mdxx = pick.Mdxx | ||
| 7224 | + } | ||
| 7225 | + }; | ||
| 7226 | + } | ||
| 7227 | + | ||
| 7096 | private static int ReadProductItemNum(JObject item) | 7228 | private static int ReadProductItemNum(JObject item) |
| 7097 | { | 7229 | { |
| 7098 | var n = item["item_num"]?.ToObject<int?>() ?? item["ItemNum"]?.ToObject<int?>(); | 7230 | var n = item["item_num"]?.ToObject<int?>() ?? item["ItemNum"]?.ToObject<int?>(); |
| @@ -7588,12 +7720,11 @@ public class OrderService | @@ -7588,12 +7720,11 @@ public class OrderService | ||
| 7588 | return; | 7720 | return; |
| 7589 | } | 7721 | } |
| 7590 | 7722 | ||
| 7723 | + // 销售出库 Create 已 AllowAnonymous。推送/补扫没有登录态时,服务账号登录失败 | ||
| 7724 | + // 不能再把整单停成「缺少 ERP 鉴权」;无 token 也继续提交。 | ||
| 7591 | var token = await GetErpTokenAsync(); | 7725 | var token = await GetErpTokenAsync(); |
| 7592 | if (string.IsNullOrWhiteSpace(token)) | 7726 | if (string.IsNullOrWhiteSpace(token)) |
| 7593 | - { | ||
| 7594 | - await RecordAutoXsckdFailureAsync(orderId, "缺少 ERP 鉴权"); | ||
| 7595 | - return; | ||
| 7596 | - } | 7727 | + _logger.LogWarning("自动开单未取得 ERP token,改为匿名创建销售出库单: OrderId={OrderId}", orderId); |
| 7597 | 7728 | ||
| 7598 | var needWaybillUpdate = false; | 7729 | var needWaybillUpdate = false; |
| 7599 | if (string.IsNullOrWhiteSpace(waybill.Cjck) && !string.IsNullOrWhiteSpace(shopSettings.Ck)) | 7730 | if (string.IsNullOrWhiteSpace(waybill.Cjck) && !string.IsNullOrWhiteSpace(shopSettings.Ck)) |
| @@ -8208,30 +8339,129 @@ public class OrderService | @@ -8208,30 +8339,129 @@ public class OrderService | ||
| 8208 | 8339 | ||
| 8209 | private static decimal? ResolveMergedMerchantIncomeYuan(IReadOnlyList<Order> siblings, Waybill waybill) | 8340 | private static decimal? ResolveMergedMerchantIncomeYuan(IReadOnlyList<Order> siblings, Waybill waybill) |
| 8210 | { | 8341 | { |
| 8342 | + decimal? shippable = SumShippableMerchantIncomeYuan(siblings); | ||
| 8211 | if (waybill.MerchantIncome.HasValue) | 8343 | if (waybill.MerchantIncome.HasValue) |
| 8212 | - return waybill.MerchantIncome.Value; | ||
| 8213 | - | ||
| 8214 | - if (siblings.Count <= 1) | ||
| 8215 | { | 8344 | { |
| 8216 | - var single = siblings[0]; | ||
| 8217 | - OrderPricingHelper.ApplyResolvedMerchantIncome(single); | ||
| 8218 | - return OrderPricingHelper.ResolveMerchantIncomeYuan(single) | ||
| 8219 | - ?? (single.PayAmount.HasValue ? single.PayAmount.Value / 100m : (decimal?)null); | 8345 | + var stored = waybill.MerchantIncome.Value; |
| 8346 | + var hasRefund = siblings.Any(o => DouyinSkuRefundHelper.HasAnyRefundedOrRefundingItem(o.ProductItems)); | ||
| 8347 | + if (hasRefund && shippable.HasValue && stored > shippable.Value + 0.01m) | ||
| 8348 | + return shippable; | ||
| 8349 | + return stored; | ||
| 8220 | } | 8350 | } |
| 8221 | 8351 | ||
| 8352 | + return shippable; | ||
| 8353 | + } | ||
| 8354 | + | ||
| 8355 | + /// <summary>各订单可发货子单商家实收之和;没有子单退款标记时等于订单级实收。</summary> | ||
| 8356 | + private static decimal? SumShippableMerchantIncomeYuan(IReadOnlyList<Order> orders) | ||
| 8357 | + { | ||
| 8358 | + if (orders == null || orders.Count == 0) return null; | ||
| 8222 | decimal sum = 0m; | 8359 | decimal sum = 0m; |
| 8223 | var hasValue = false; | 8360 | var hasValue = false; |
| 8224 | - foreach (var o in siblings) | 8361 | + foreach (var o in orders) |
| 8225 | { | 8362 | { |
| 8226 | OrderPricingHelper.ApplyResolvedMerchantIncome(o); | 8363 | OrderPricingHelper.ApplyResolvedMerchantIncome(o); |
| 8227 | var inc = OrderPricingHelper.ResolveMerchantIncomeYuan(o) | 8364 | var inc = OrderPricingHelper.ResolveMerchantIncomeYuan(o) |
| 8228 | - ?? (o.PayAmount.HasValue ? o.PayAmount.Value / 100m : 0m); | 8365 | + ?? (o.PayAmount.HasValue ? o.PayAmount.Value / 100m : (decimal?)null); |
| 8229 | inc = DouyinSkuRefundHelper.ComputeShippableMerchantIncomeYuan(o.ProductItems, inc) ?? inc; | 8366 | inc = DouyinSkuRefundHelper.ComputeShippableMerchantIncomeYuan(o.ProductItems, inc) ?? inc; |
| 8230 | - sum += inc; | 8367 | + if (!inc.HasValue) continue; |
| 8368 | + sum += inc.Value; | ||
| 8231 | hasValue = true; | 8369 | hasValue = true; |
| 8232 | } | 8370 | } |
| 8371 | + return hasValue ? Math.Round(sum, 2, MidpointRounding.AwayFromZero) : null; | ||
| 8372 | + } | ||
| 8233 | 8373 | ||
| 8234 | - return hasValue ? sum : null; | 8374 | + /// <summary> |
| 8375 | + /// 生成出库单前拉取抖店子单。只回写商品明细与部分退款标记,不改订单状态,避免发货前退款把整单打成不可出库。 | ||
| 8376 | + /// </summary> | ||
| 8377 | + private async Task RefreshProductItemsBeforeOutboundAsync(IReadOnlyList<Order> orders) | ||
| 8378 | + { | ||
| 8379 | + foreach (var o in orders) | ||
| 8380 | + { | ||
| 8381 | + if (o == null || !o.ShopId.HasValue || string.IsNullOrWhiteSpace(o.OrderId)) | ||
| 8382 | + continue; | ||
| 8383 | + try | ||
| 8384 | + { | ||
| 8385 | + var douyinService = GetDouyinServiceForOrder(o); | ||
| 8386 | + var dy = await douyinService.GetOrderDetailAsDouyinOrderAsync(o.OrderId); | ||
| 8387 | + if (dy == null || string.IsNullOrWhiteSpace(dy.ProductItems)) | ||
| 8388 | + continue; | ||
| 8389 | + var diff = TryApplyProductItemsFromDouyin(o, dy); | ||
| 8390 | + if (!diff.HasChanges) | ||
| 8391 | + continue; | ||
| 8392 | + o.UpdateTime = DateTime.Now; | ||
| 8393 | + await _db.Updateable(o) | ||
| 8394 | + .UpdateColumns(x => new | ||
| 8395 | + { | ||
| 8396 | + x.ProductItems, | ||
| 8397 | + x.OriginalProductItems, | ||
| 8398 | + x.ProductName, | ||
| 8399 | + x.ProductPic, | ||
| 8400 | + x.ProductSpec, | ||
| 8401 | + x.ItemCount, | ||
| 8402 | + x.PartialRefund, | ||
| 8403 | + x.UpdateTime | ||
| 8404 | + }) | ||
| 8405 | + .ExecuteCommandAsync(); | ||
| 8406 | + _logger.LogInformation( | ||
| 8407 | + "出库前已刷新抖店商品/退款: OrderId={OrderId}, {Summary}", | ||
| 8408 | + o.OrderId, diff.Summary); | ||
| 8409 | + } | ||
| 8410 | + catch (Exception ex) | ||
| 8411 | + { | ||
| 8412 | + _logger.LogWarning(ex, "出库前刷新抖店商品失败,按本地明细计金额: OrderId={OrderId}", o.OrderId); | ||
| 8413 | + } | ||
| 8414 | + } | ||
| 8415 | + } | ||
| 8416 | + | ||
| 8417 | + /// <summary> | ||
| 8418 | + /// 出库前已退款/退款中的子单不计入原价和商家实收。 | ||
| 8419 | + /// 发货单或前端若仍传父单总额,这里压到可发货子单合计;手工改低的金额保持不变。 | ||
| 8420 | + /// </summary> | ||
| 8421 | + private static bool CapOutboundAmountsForPreShipRefund( | ||
| 8422 | + IReadOnlyList<Order> orders, | ||
| 8423 | + ref long orderAmtFen, | ||
| 8424 | + ref decimal sjssrjeYuan) | ||
| 8425 | + { | ||
| 8426 | + if (orders == null || orders.Count == 0) | ||
| 8427 | + return false; | ||
| 8428 | + if (!orders.Any(o => DouyinSkuRefundHelper.HasAnyRefundedOrRefundingItem(o.ProductItems))) | ||
| 8429 | + return false; | ||
| 8430 | + | ||
| 8431 | + long shippableFen = 0; | ||
| 8432 | + var hasOrderAmt = false; | ||
| 8433 | + foreach (var o in orders) | ||
| 8434 | + { | ||
| 8435 | + var lineFen = DouyinSkuRefundHelper.SumShippableOrderAmountFen(o.ProductItems); | ||
| 8436 | + if (lineFen > 0) | ||
| 8437 | + { | ||
| 8438 | + shippableFen += lineFen; | ||
| 8439 | + hasOrderAmt = true; | ||
| 8440 | + continue; | ||
| 8441 | + } | ||
| 8442 | + | ||
| 8443 | + if (!DouyinSkuRefundHelper.HasAnyRefundedOrRefundingItem(o.ProductItems) && (o.OrderAmount ?? 0) > 0) | ||
| 8444 | + { | ||
| 8445 | + shippableFen += o.OrderAmount ?? 0L; | ||
| 8446 | + hasOrderAmt = true; | ||
| 8447 | + } | ||
| 8448 | + } | ||
| 8449 | + | ||
| 8450 | + var changed = false; | ||
| 8451 | + if (hasOrderAmt && shippableFen > 0 && orderAmtFen > shippableFen) | ||
| 8452 | + { | ||
| 8453 | + orderAmtFen = shippableFen; | ||
| 8454 | + changed = true; | ||
| 8455 | + } | ||
| 8456 | + | ||
| 8457 | + var shippableIncome = SumShippableMerchantIncomeYuan(orders); | ||
| 8458 | + if (shippableIncome.HasValue && sjssrjeYuan > shippableIncome.Value + 0.01m) | ||
| 8459 | + { | ||
| 8460 | + sjssrjeYuan = shippableIncome.Value; | ||
| 8461 | + changed = true; | ||
| 8462 | + } | ||
| 8463 | + | ||
| 8464 | + return changed; | ||
| 8235 | } | 8465 | } |
| 8236 | 8466 | ||
| 8237 | private async Task<bool> OrderHasSerialManagedProductsAsync(string? productItemsJson) | 8467 | private async Task<bool> OrderHasSerialManagedProductsAsync(string? productItemsJson) |
| @@ -8347,16 +8577,15 @@ public class OrderService | @@ -8347,16 +8577,15 @@ public class OrderService | ||
| 8347 | private async Task<string?> GetErpTokenAsync() | 8577 | private async Task<string?> GetErpTokenAsync() |
| 8348 | { | 8578 | { |
| 8349 | var ctx = _httpContextAccessor.HttpContext; | 8579 | var ctx = _httpContextAccessor.HttpContext; |
| 8350 | - var raw = ctx?.Request?.Headers["Authorization"].ToString(); | ||
| 8351 | - if (!string.IsNullOrWhiteSpace(raw)) | ||
| 8352 | - { | ||
| 8353 | - if (raw.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase)) | ||
| 8354 | - raw = raw.Substring("Bearer ".Length).Trim(); | ||
| 8355 | - return raw; | ||
| 8356 | - } | 8580 | + var fromRequest = NormalizeErpBearerToken(ctx?.Request?.Headers["Authorization"].ToString()); |
| 8581 | + // 只认真正的 JWT。空 Bearer、网关占位、抖店回调头不能当成 ERP 登录态,否则不会再走服务账号。 | ||
| 8582 | + if (LooksLikeJwt(fromRequest)) | ||
| 8583 | + return fromRequest; | ||
| 8357 | 8584 | ||
| 8358 | - if (_cache.TryGetValue(ErpServiceTokenCacheKey, out string? cached) && !string.IsNullOrWhiteSpace(cached)) | ||
| 8359 | - return cached; | 8585 | + var cachedToken = NormalizeErpBearerToken( |
| 8586 | + _cache.TryGetValue(ErpServiceTokenCacheKey, out string? cached) ? cached : null); | ||
| 8587 | + if (LooksLikeJwt(cachedToken)) | ||
| 8588 | + return cachedToken; | ||
| 8360 | 8589 | ||
| 8361 | var account = (_configuration["DouyinLogistics:ErpServiceAccount"] ?? "").Trim(); | 8590 | var account = (_configuration["DouyinLogistics:ErpServiceAccount"] ?? "").Trim(); |
| 8362 | var password = (_configuration["DouyinLogistics:ErpServicePassword"] ?? "").Trim(); | 8591 | var password = (_configuration["DouyinLogistics:ErpServicePassword"] ?? "").Trim(); |
| @@ -8383,11 +8612,11 @@ public class OrderService | @@ -8383,11 +8612,11 @@ public class OrderService | ||
| 8383 | } | 8612 | } |
| 8384 | 8613 | ||
| 8385 | var root = JsonConvert.DeserializeObject<JObject>(body); | 8614 | var root = JsonConvert.DeserializeObject<JObject>(body); |
| 8386 | - var token = root?["data"]?["token"]?.ToString(); | 8615 | + var token = NormalizeErpBearerToken(root?["data"]?["token"]?.ToString()); |
| 8387 | if (string.IsNullOrWhiteSpace(token)) | 8616 | if (string.IsNullOrWhiteSpace(token)) |
| 8388 | - token = root?["token"]?.ToString(); | 8617 | + token = NormalizeErpBearerToken(root?["token"]?.ToString()); |
| 8389 | 8618 | ||
| 8390 | - if (string.IsNullOrWhiteSpace(token)) | 8619 | + if (!LooksLikeJwt(token)) |
| 8391 | { | 8620 | { |
| 8392 | _logger.LogWarning("ERP 服务账号登录成功但未解析到 token: Body={Body}", body); | 8621 | _logger.LogWarning("ERP 服务账号登录成功但未解析到 token: Body={Body}", body); |
| 8393 | return null; | 8622 | return null; |
| @@ -8403,6 +8632,23 @@ public class OrderService | @@ -8403,6 +8632,23 @@ public class OrderService | ||
| 8403 | } | 8632 | } |
| 8404 | } | 8633 | } |
| 8405 | 8634 | ||
| 8635 | + /// <summary>去掉 Bearer 前缀。登录接口返回的 token 已带 Bearer,再套一层会变成 Bearer Bearer。</summary> | ||
| 8636 | + private static string? NormalizeErpBearerToken(string? raw) | ||
| 8637 | + { | ||
| 8638 | + var token = (raw ?? "").Trim(); | ||
| 8639 | + if (token.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase)) | ||
| 8640 | + token = token.Substring("Bearer ".Length).Trim(); | ||
| 8641 | + return string.IsNullOrWhiteSpace(token) ? null : token; | ||
| 8642 | + } | ||
| 8643 | + | ||
| 8644 | + private static bool LooksLikeJwt(string? token) | ||
| 8645 | + { | ||
| 8646 | + if (string.IsNullOrWhiteSpace(token)) | ||
| 8647 | + return false; | ||
| 8648 | + var parts = token.Split('.'); | ||
| 8649 | + return parts.Length == 3 && parts.All(p => p.Length > 0); | ||
| 8650 | + } | ||
| 8651 | + | ||
| 8406 | /// <summary> | 8652 | /// <summary> |
| 8407 | /// 比较两份发货单 ProductInfo 是否一致(用于判断是否允许重复提交)。 | 8653 | /// 比较两份发货单 ProductInfo 是否一致(用于判断是否允许重复提交)。 |
| 8408 | /// </summary> | 8654 | /// </summary> |
Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/NCC.Extend.Entitys.xml
| @@ -6665,6 +6665,11 @@ | @@ -6665,6 +6665,11 @@ | ||
| 6665 | 是否享受会员权益(积分/会员折扣/优惠券等;1是0否,默认1) | 6665 | 是否享受会员权益(积分/会员折扣/优惠券等;1是0否,默认1) |
| 6666 | </summary> | 6666 | </summary> |
| 6667 | </member> | 6667 | </member> |
| 6668 | + <member name="P:NCC.Extend.Entitys.Dto.WtHy.WtHyCrInput.khflId"> | ||
| 6669 | + <summary> | ||
| 6670 | + 客户分类 Id(空则默认「门店散客」) | ||
| 6671 | + </summary> | ||
| 6672 | + </member> | ||
| 6668 | <member name="T:NCC.Extend.Entitys.Dto.WtHy.WtHyInfoOutput"> | 6673 | <member name="T:NCC.Extend.Entitys.Dto.WtHy.WtHyInfoOutput"> |
| 6669 | <summary> | 6674 | <summary> |
| 6670 | 客户信息输出参数 | 6675 | 客户信息输出参数 |
| @@ -6805,6 +6810,16 @@ | @@ -6805,6 +6810,16 @@ | ||
| 6805 | 是否享受会员权益(积分/会员折扣/优惠券等;1是0否) | 6810 | 是否享受会员权益(积分/会员折扣/优惠券等;1是0否) |
| 6806 | </summary> | 6811 | </summary> |
| 6807 | </member> | 6812 | </member> |
| 6813 | + <member name="P:NCC.Extend.Entitys.Dto.WtHy.WtHyInfoOutput.khflId"> | ||
| 6814 | + <summary> | ||
| 6815 | + 客户分类 Id | ||
| 6816 | + </summary> | ||
| 6817 | + </member> | ||
| 6818 | + <member name="P:NCC.Extend.Entitys.Dto.WtHy.WtHyInfoOutput.khflMc"> | ||
| 6819 | + <summary> | ||
| 6820 | + 客户分类名称(大类/子级路径) | ||
| 6821 | + </summary> | ||
| 6822 | + </member> | ||
| 6808 | <member name="T:NCC.Extend.Entitys.Dto.WtHy.WtHyListOutput"> | 6823 | <member name="T:NCC.Extend.Entitys.Dto.WtHy.WtHyListOutput"> |
| 6809 | <summary> | 6824 | <summary> |
| 6810 | 客户信息输入参数 | 6825 | 客户信息输入参数 |
| @@ -6920,6 +6935,16 @@ | @@ -6920,6 +6935,16 @@ | ||
| 6920 | 备注(租赁还卡联系等) | 6935 | 备注(租赁还卡联系等) |
| 6921 | </summary> | 6936 | </summary> |
| 6922 | </member> | 6937 | </member> |
| 6938 | + <member name="P:NCC.Extend.Entitys.Dto.WtHy.WtHyListOutput.khflId"> | ||
| 6939 | + <summary> | ||
| 6940 | + 客户分类 Id | ||
| 6941 | + </summary> | ||
| 6942 | + </member> | ||
| 6943 | + <member name="P:NCC.Extend.Entitys.Dto.WtHy.WtHyListOutput.khflMc"> | ||
| 6944 | + <summary> | ||
| 6945 | + 客户分类名称(大类/子级路径) | ||
| 6946 | + </summary> | ||
| 6947 | + </member> | ||
| 6923 | <member name="T:NCC.Extend.Entitys.Dto.WtHy.WtHyListQueryInput"> | 6948 | <member name="T:NCC.Extend.Entitys.Dto.WtHy.WtHyListQueryInput"> |
| 6924 | <summary> | 6949 | <summary> |
| 6925 | 客户信息列表查询输入 | 6950 | 客户信息列表查询输入 |
| @@ -7030,6 +7055,11 @@ | @@ -7030,6 +7055,11 @@ | ||
| 7030 | 备注关键词(模糊匹配 F_Bz,可与 bzHas 组合) | 7055 | 备注关键词(模糊匹配 F_Bz,可与 bzHas 组合) |
| 7031 | </summary> | 7056 | </summary> |
| 7032 | </member> | 7057 | </member> |
| 7058 | + <member name="P:NCC.Extend.Entitys.Dto.WtHy.WtHyListQueryInput.khflId"> | ||
| 7059 | + <summary> | ||
| 7060 | + 客户分类 Id(含所选节点及其全部下级) | ||
| 7061 | + </summary> | ||
| 7062 | + </member> | ||
| 7033 | <member name="T:NCC.Extend.Entitys.Dto.WtHy.WtHyUpInput"> | 7063 | <member name="T:NCC.Extend.Entitys.Dto.WtHy.WtHyUpInput"> |
| 7034 | <summary> | 7064 | <summary> |
| 7035 | 客户信息更新输入参数 | 7065 | 客户信息更新输入参数 |
| @@ -7640,6 +7670,36 @@ | @@ -7640,6 +7670,36 @@ | ||
| 7640 | 主键 | 7670 | 主键 |
| 7641 | </summary> | 7671 | </summary> |
| 7642 | </member> | 7672 | </member> |
| 7673 | + <member name="T:NCC.Extend.Entitys.Dto.WtHyKhfl.WtHyKhflCascaderNodeOutput"> | ||
| 7674 | + <summary> | ||
| 7675 | + 客户分类级联节点(el-cascader / el-tree-select) | ||
| 7676 | + </summary> | ||
| 7677 | + </member> | ||
| 7678 | + <member name="T:NCC.Extend.Entitys.Dto.WtHyKhfl.WtHyKhflCrInput"> | ||
| 7679 | + <summary> | ||
| 7680 | + 客户分类新建/更新入参 | ||
| 7681 | + </summary> | ||
| 7682 | + </member> | ||
| 7683 | + <member name="P:NCC.Extend.Entitys.Dto.WtHyKhfl.WtHyKhflCrInput.parentId"> | ||
| 7684 | + <summary> | ||
| 7685 | + 上级分类 Id,空表示大类 | ||
| 7686 | + </summary> | ||
| 7687 | + </member> | ||
| 7688 | + <member name="P:NCC.Extend.Entitys.Dto.WtHyKhfl.WtHyKhflCrInput.mc"> | ||
| 7689 | + <summary> | ||
| 7690 | + 分类名称 | ||
| 7691 | + </summary> | ||
| 7692 | + </member> | ||
| 7693 | + <member name="P:NCC.Extend.Entitys.Dto.WtHyKhfl.WtHyKhflCrInput.xh"> | ||
| 7694 | + <summary> | ||
| 7695 | + 排序序号 | ||
| 7696 | + </summary> | ||
| 7697 | + </member> | ||
| 7698 | + <member name="T:NCC.Extend.Entitys.Dto.WtHyKhfl.WtHyKhflListOutput"> | ||
| 7699 | + <summary> | ||
| 7700 | + 客户分类扁平列表一行 | ||
| 7701 | + </summary> | ||
| 7702 | + </member> | ||
| 7643 | <member name="T:NCC.Extend.Entitys.Dto.WtHyKjqy.WtHyKjqyCrInput"> | 7703 | <member name="T:NCC.Extend.Entitys.Dto.WtHyKjqy.WtHyKjqyCrInput"> |
| 7644 | <summary> | 7704 | <summary> |
| 7645 | 卡卷类型管理修改输入参数 | 7705 | 卡卷类型管理修改输入参数 |
| @@ -23804,6 +23864,11 @@ | @@ -23804,6 +23864,11 @@ | ||
| 23804 | 是否享受会员权益(积分赚取/抵扣、权益卡复购折、优惠券等;1是0否) | 23864 | 是否享受会员权益(积分赚取/抵扣、权益卡复购折、优惠券等;1是0否) |
| 23805 | </summary> | 23865 | </summary> |
| 23806 | </member> | 23866 | </member> |
| 23867 | + <member name="P:NCC.Extend.Entitys.WtHyEntity.KhflId"> | ||
| 23868 | + <summary> | ||
| 23869 | + 客户分类(wt_hy_khfl.F_Id) | ||
| 23870 | + </summary> | ||
| 23871 | + </member> | ||
| 23807 | <member name="T:NCC.Extend.Entitys.WtHyJfEntity"> | 23872 | <member name="T:NCC.Extend.Entitys.WtHyJfEntity"> |
| 23808 | <summary> | 23873 | <summary> |
| 23809 | 积分明细管理 | 23874 | 积分明细管理 |
| @@ -23839,6 +23904,11 @@ | @@ -23839,6 +23904,11 @@ | ||
| 23839 | 积分时间 | 23904 | 积分时间 |
| 23840 | </summary> | 23905 | </summary> |
| 23841 | </member> | 23906 | </member> |
| 23907 | + <member name="T:NCC.Extend.Entitys.WtHyKhflEntity"> | ||
| 23908 | + <summary> | ||
| 23909 | + 客户档案分类(树形:大类-子级) | ||
| 23910 | + </summary> | ||
| 23911 | + </member> | ||
| 23842 | <member name="T:NCC.Extend.Entitys.WtHyKjqyEntity"> | 23912 | <member name="T:NCC.Extend.Entitys.WtHyKjqyEntity"> |
| 23843 | <summary> | 23913 | <summary> |
| 23844 | 卡卷类型管理 | 23914 | 卡卷类型管理 |