Commit Graph

86 Commits

Author SHA1 Message Date
zzh
73f334edc8 fix: 卖价同步态对比改用 canonical JSON,避免误报待发布
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
待发布与线上两侧统一规范化后再算哈希,消除排序与 FactorValuesJson 形态差异导致的假 diff。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-07 19:13:26 +08:00
zzh
35156eedf4 feat: 渠道买价/规则发布钉 KPI 分区包,排货应付按渠道价区解析
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
各渠道异构价区与偏远不再复用产品卖价 zoneKeys;发布只存包引用,计费 hydrate 后硬失败。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-07 17:19:39 +08:00
zzh
bb8c0a906c feat: 卖价/规则发布钉 KPI 分区包,快照只存引用
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
分区明细独立版本化并缓存加载,计费包缺失严格失败;同步态接口不再拉全文。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-07 16:42:42 +08:00
zzh
6faadcf2a1 feat: 卖价支持多价格分区表,列表返回创建/修改人
All checks were successful
Build and Deploy / deploy (push) Successful in 1m7s
合并多 Area 分区规则进发布快照,计费用规则自身 AreaId 匹配;产品与渠道列表补 CreateBy/UpdateBy。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-07 10:57:21 +08:00
zzh
f972a28d79 feat: 落地滚动会员、券发放与邀请分成奖励
All checks were successful
Build and Deploy / deploy (push) Successful in 3m50s
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-06 17:40:24 +08:00
zzh
8d7df40bdf feat: 销售产品独立改代码,分区明细导入保存按规则去重
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-06 15:37:03 +08:00
zzh
04dc9ca1ff feat: 分区明细导入模板去掉国家名称,并增加枚举值 Sheet
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
导入模板只保留国家代码;Sheet2 列出匹配维度/方式的编码与名称,导入时按代码补国家名称。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-06 10:58:23 +08:00
zzh
f063c99d1b feat: OpenAPI 增加轨迹/文件查询,创单按 clientNo 幂等
客户 HMAC 通过后再查本客户订单;禁止下游面单,附件增加 POD。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-05 18:48:21 +08:00
zzh
b748aa4000 fix: 收紧分区 range、进位相接与仅国家估算口径
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
进位区间改为左开右闭且禁止空洞,邮编 range 按数字/字母数字比较,查价仅国家时不再串用别国 zone。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-05 17:35:18 +08:00
zzh
74a71991b2 feat: 统一价格/黑名单/偏远分区匹配,并落库 MatchDim
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-05 16:12:09 +08:00
zzh
1b6e91b09d feat: OpenAPI 鉴权改 HMAC 签名校验,并完善下单报文处理
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-30 17:33:46 +08:00
zzh
87f4cebc9b feat: openApi 统一信封与推费字段对齐,下单鉴权改请求头
All checks were successful
Build and Deploy / deploy (push) Successful in 56s
推费入参对齐表字段;创建订单凭证走 appKey/appSecret Header,去掉上门揽收与 Body 内 customerId。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-30 12:17:50 +08:00
zzh
2688058cb3 feat: 客户 OpenAPI 机机凭证与 whoami 探针
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
一主客户一对 AppKey/AppSecret,支持门户自助与后台代管启停重置,供应商回调路径不动。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-30 10:19:38 +08:00
zzh
c9084ee5ca fix: 合并 master 后改用 IObjectStorage,对齐 fake oss
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-23 11:37:27 +08:00
zzh
5648163958 merge master into test: 揽收下游预报与近期功能,保留 fake oss
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-23 11:30:17 +08:00
zzh
26f9d8be7f feat: 揽收单预报下游改从 t_pickup_order 组装 createOrderOne
All checks were successful
Build and Deploy / deploy (push) Successful in 1m43s
新增 /order/pickup-order/downstream-forward,productCode/supplierCode/地址重量商品均取揽收单,不再依赖关联物流单。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-22 19:17:09 +08:00
zzh
8ce8b82f48 feat: 客户出口资质备案与申报要素,9610 预报直连下游
All checks were successful
Build and Deploy / deploy (push) Successful in 1m49s
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-22 18:13:55 +08:00
dd1318bc00 feat:对接fake oss
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
2026-09-22 16:59:33 +08:00
zzh
e5c9364434 feat: 排货规则支持判断条件公式并完善失败溯源
All checks were successful
Build and Deploy / deploy (push) Successful in 1m49s
用 MatchCondition 中文公式筛选可用渠道后再按方案选渠;失败时落完整排货过程(阶段、公式摘要、池汇总),并兼容旧 CustomerIds。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-17 19:43:05 +08:00
zzh
6b920cc49d fix: 对齐 createOrderOne 下游预报请求体,productCode 取预报渠道 code
All checks were successful
Build and Deploy / deploy (push) Successful in 1m46s
移除 channelCode 等多余字段,改用专用 ItfxCreateOrderOneBody。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-16 17:43:30 +08:00
zzh
14f3df3fa5 fix: 下游预报凭证快照整套同源,避免与订单字段混拼
All checks were successful
Build and Deploy / deploy (push) Successful in 1m45s
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-14 18:13:37 +08:00
zzh
0fdc9e29f4 feat: API中心其他配置与面单 COS 流代理
All checks were successful
Build and Deploy / deploy (push) Successful in 1m52s
将 itfx 网关优先读其他配置 api_center(含 AppKey/AppSecret 回退),面单预览经服务端代理拉取 COS。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-12 17:40:52 +08:00
zzh
87abcecb65 feat: 对账件重尺导入与应收只留一套
All checks were successful
Build and Deploy / deploy (push) Successful in 1m45s
新增 downstream 重量导入并锁定渠道重算应付;重算应收清空全部阶段;费用软删与查询过滤,避免预报入库叠算。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-12 16:57:28 +08:00
zzh
43fcb4136a feat: SkuImage 存 storage key,包裹 summary,修复批次测试
All checks were successful
Build and Deploy / deploy (push) Successful in 1m48s
避免签名 URL 超长写库;新增包裹状态汇总;OrderBatchJobCoordinator 注入 IFileStorage 后补齐单测。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-12 12:30:35 +08:00
56c18c0343 feat:加强cos log
All checks were successful
Build and Deploy / deploy (push) Successful in 1m41s
2026-09-10 18:00:18 +08:00
943ba539a4 feat: cos
All checks were successful
Build and Deploy / deploy (push) Successful in 1m43s
2026-09-10 17:32:49 +08:00
zzh
eba1fa4867 feat: 注册绑定所属顾问与岗位职级字典种子
支持 AdvisorCode 写入 CustomerService=Account;补充 employee_position/employee_job_level 初始 SQL。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-03 12:45:13 +08:00
zzh
7e442180cd fix: avoid SqlSugar invalid SQL from null/HasValue KB filters
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-04 16:53:09 +08:00
zzh
b2355104cf feat: 完善揽收单与问题件处理能力
补齐揽收单字段/并发戳与问题件处理人配置,扩展异常工作流与下单同步揽收出参;移除已收货状态并补充相关 SQL 脚本。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-04 11:49:23 +08:00
zzh
c02cb21049 feat: add pickup-order model and door-pickup linking
Support 1 pickup to N logistics orders with create/pay/schedule APIs, parcel inboundMethod auto-attach, plus allocation-trace and inbound-billing updates already in tree.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-03 12:22:30 +08:00
zzh
c8107cb565 feat: add additional-service billing, conditions, and fee lifecycle hardening
Support optional services and executable billing conditions on sell/buy prices, percent-of-value and percent-of-freight formulas, place-order/inbound payable on chargeable weight, outbound receivable freeze, channel remote areas, billing simulate, and insurance-aware claims.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-01 18:04:28 +08:00
zzh
592054f062 feat: extract global AI service and persist sales-product publish AI reports
Move provider/chat APIs from /xhs/ai to /ai, rename t_ai_provider, and require adopted AI analysis on price publish.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-01 15:56:40 +08:00
zzh
206dc3ef3c feat: ??????????????????????????
?????????????????????????????????? SQL?

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-30 15:16:55 +08:00
zzh
f2f4cbf35b fix: 无邮箱注册改用占位邮箱,避免空串撞 uk_user_email
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 18:28:33 +08:00
zzh
0d578059ec fix: treat null/undefined contact strings as empty
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 17:28:37 +08:00
zzh
7c410b1625 feat: 新增轻量 MCP 工具与 AI Agent,并限制 token 滥用
提供查价格/对客说明/查轨迹工具与管理接口;扩展 LLM function calling;按用户 Redis 限流并压缩上下文与工具结果。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 12:03:45 +08:00
zzh
53c986c746 fix: 修复智谱 AI 对话 URL,并合并自动触发预报时机
XhsLlmClient 对 /v4 基址不再错误拼接 /v1;自动触发「预报」归一为「下单」并补充迁移 SQL;下单失败支持存草稿相关入参与计费回滚调整。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-28 20:54:28 +08:00
zzh
fffecb5964 Fix downstream forecast: pass auth + cache itfx app secret
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-27 18:08:09 +08:00
zzh
69d234c705 feat: simplify WeChat register and require contact before order
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-27 13:07:29 +08:00
zzh
5003cacd79 fix: repair marketing compile errors and harden deploy CI
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-27 10:51:13 +08:00
zzh
c5fb4c7e58 feat: add employee profile, IDE employee nos, and marketing invite/coupon fixes
Introduce t_employee linked to RBAC users, switch employee numbers to IDE001+, and keep invite bind/newcomer coupon backend changes. Drop retired sql/migrate and seed scripts in favor of db.sql.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-26 23:18:57 +08:00
zzh
89233bc3da feat: add customer marketing module (M1-M6 backend)
Implement referral, points, coupons, commission, member levels, and order integration with migration SQL and background jobs.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-23 16:42:08 +08:00
zzh
8329bbc3a6 fix: unify publish snapshot API output and normalize legacy price content
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-23 12:03:47 +08:00
zzh
e2dca20966 fix: strip audit fields from channel price publish snapshots
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-23 11:55:21 +08:00
zzh
ecfaad3824 fix: align service channel publish snapshot JSON with preview API
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-23 11:25:35 +08:00
zzh
15785cdf2b feat: enrich publish snapshots with downstream names and use API provider code for track ApiCode
Persist group/app/API provider display names in sales product and service channel rules publish snapshots, and resolve trajectory ApiCode from the service channel API provider code instead of forecast code.
2026-07-23 10:23:56 +08:00
zzh
3d5eaa223a feat: 小包全链路加固、待排货与运单号 IDE 前缀
查价/下单/入库/出库统一校验与计费上下文;待排货状态及可选入库排货;运单号改为 IDE+yyMMddHHmmss;补充迁移 SQL 与测试修复。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 19:00:55 +08:00
zzh
f4ddd993b9 feat: 管理端列表返回客户名称/编码,并加固绑定与客户会话
订单/包裹/库存/店铺授权/店铺订单列表补充 customerName、customerCode;库存绑定按会话客户解析并兼容可用量;修复客户 mapId 识别与 ConcurrencyStamp 迁移。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-18 11:10:53 +08:00
zzh
c2c03f63e3 feat: 店铺平台 OAuth 配置迁入其他配置页
运行时优先读 t_system_other_config,修正管理端客户提示文案,并提供配置种子 SQL。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-16 11:03:02 +08:00
zzh
341a318f0b feat: 客户发件地址与揽收订单,复用小包创建全链路。
新增地址簿 CRUD、pickup/create、订单 orderSource 筛选;附带包裹商品图片上传接口。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-15 18:58:48 +08:00