ideship/admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
373 Commits 3 Branches 0 Tags 16 MiB
264c3a5dcb
Commit Graph

315 Commits

Author SHA1 Message Date
zzh
43fcb4136a feat: SkuImage 存 storage key，包裹 summary，修复批次测试
All checks were successful
Build and Deploy / deploy (push) Successful in 1m48s
Details 
避免签名 URL 超长写库；新增包裹状态汇总；OrderBatchJobCoordinator 注入 IFileStorage 后补齐单测。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-12 12:30:35 +08:00
zzh
40997f7d71 feat: 新增 /file-storage/stream 供面单预览鉴权读取
All checks were successful
Build and Deploy / deploy (push) Successful in 1m46s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-11 19:14:26 +08:00
zzh
d1d31fee8a fix: 仓储图片上传支持 customerId，9610 明细补并发戳且主从安全
All checks were successful
Build and Deploy / deploy (push) Successful in 1m43s
Details 
上传接口接受 query customerId；ConcurrencyStamp 默认改为空串并用主键确定性回填，避免 Galera UUID unsafe。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-11 12:09:36 +08:00
xiaolipro
d1e3672808 feat：cos
All checks were successful
Build and Deploy / deploy (push) Successful in 1m47s
Details
2026-09-11 11:34:59 +08:00
xiaolipro
56c18c0343 feat：加强cos log
All checks were successful
Build and Deploy / deploy (push) Successful in 1m41s
Details
2026-09-10 18:00:18 +08:00
xiaolipro
943ba539a4 feat: cos
All checks were successful
Build and Deploy / deploy (push) Successful in 1m43s
Details
2026-09-10 17:32:49 +08:00
zzh
0a16f27664 fix: 修复微信 mp 路由 regex 导致生产启动失败
All checks were successful
Build and Deploy / deploy (push) Successful in 32s
Details 
ASP.NET 路由模板中方括号需转义为 [[ ]]，否则应用在 InitializeApplication 阶段崩溃。
 2026-09-09 15:31:54 +08:00
zzh
41db6fa0af chore: 生产/测试配置分离，并收紧微信 mp AppId 路由
Some checks failed
Build and Deploy / deploy (push) Failing after 35s
Details 
Development 指向 oms.nanafa.com；Production 指向 ideship.com。微信 /wechat/mp/{appId} 仅匹配 wx 前缀。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-09 12:38:12 +08:00
zzh
7c1be3a723 fix: 将微信 OAuth 公开配置改为 /wechat/oauth/config
All checks were successful
Build and Deploy / deploy (push) Successful in 1m42s
Details 
避免被 /wechat/mp/{appId} 吞掉导致方法/参数校验异常。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-09 12:19:31 +08:00
zzh
937f0bb78b feat: 新增微信 OAuth 公开配置接口
All checks were successful
Build and Deploy / deploy (push) Successful in 1m51s
Details 
从其他配置 wechat_mp 返回 AppId 与 OAuthRedirectBase，供 H5 网页授权使用。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-09 09:17:50 +08:00
xiaolipro
7700baf127 feat：迁移到gitea
All checks were successful
Build and Deploy / deploy (push) Successful in 56s
Details
2026-09-05 16:34:35 +08:00
zzh
b81432c0af feat: 查价结果返回销售产品说明 
OrderPriceCheck 输出增加 ProductDescription，供前端报价卡展示线路简要说明。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-05 16:14:16 +08:00
zzh
25b4211b46 feat: 销售产品门户目录、线路排序与公告/到货调整 
新增门户目录接口与 route_sort 字段迁移；完善公告创建与包裹到货相关逻辑。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-04 18:39:55 +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
7e9a5d4ae0 feat: 用户资料支持企业微信客服接入链接 
新增 user.WecomKfUrl 存取与迁移脚本，顾问接口同步返回该字段。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-01 19:09:34 +08:00
zzh
a70f6f2a87 feat: 接入 9610 汇总申报，字段按业务含义命名并对齐运单 
含清单/报关单拉取、ITFX 转发配置、迁移脚本与拣货单号扩展。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-30 17:46:04 +08:00
zzh
78e06d01b9 feat: 工作台扩展代发/拣货统计与业务趋势接口 
补充 Fulfill/Pickup 工作台统计 DTO 与查询实现，并扩展订单工作台聚合输出。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-28 10:59:10 +08:00
zzh
ce1349572d feat: extend receivable-payable APIs with summary, export, and filters 
Add summary/export endpoints plus customer code, effective stage, time field, and payment status filtering for finance reconciliation.
 2026-08-21 18:21:33 +08:00
zzh
2018e45a7d feat: 代发进度统计、申报HS分列与异常事件表迁移脚本 
补充代发进度 Tab 计数、PrimarySkuCodes 与 Im/Ex HS 编码输出；新增 t_order_exception_event 幂等迁移（Handler*、ConcurrencyStamp）并同步 db.sql。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-20 17:06:16 +08:00
zzh
9d813a5f89 feat: 代发订单 FulfillmentType 与进度筛选、绑定拣货后端 
支持 direct/warehouse 分轨、代发进度与库位排序、国内单号检索及到仓关联订单；扩展 SKU/店铺代发与库存绑定扣减能力。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-20 10:27:37 +08:00
zzh
654a65aba4 feat: workplace claimed stats and receiver address parse improvements 
Add claimed count to workplace stats; refine receiver address parse DTOs/helpers and AI skill seed wiring.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-09 19:06:49 +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
95940331ce feat: sync workplace spend stats and consolidate schema scripts into db.sql 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-04 16:26:22 +08:00
zzh
9a33eb00a5 feat: add knowledge base M1 APIs and workplace spend trend 2026-08-04 13:54:10 +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
cc100d40cf feat: support remote-zone factor matching and all-customer price tier 
Split price/remote zone matching in billing and prefer the 全部客户 column for any price tier key.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-02 18:22:17 +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
xiaolipro
d30375ba49 fix：auth 2026-08-01 09:18:02 +08:00
zzh
17fe638be6 fix: point SmallBag track upsert to ProviderService/Order/UpsertSmallBag 
Align OMS TrackCenter client with the renamed UpsertSmallBag endpoint.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-31 21:13:03 +08:00
zzh
a55668ec33 feat: 订单列表表头筛选、远程排序与默认90天时间窗护栏 
支持 filters[]/whitelist 排序，导出行数与批量 IN 上限，无时间窗时兜底近90天。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-31 11:25:31 +08:00
zzh
238eb5d817 feat: 新增收件地址 AI 解析接口 
支持 /order/receiver/parse-address，供 PC/H5 下单地址解析使用。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-30 20:09:42 +08:00
zzh
644da097bf feat: add WeChat OAuth login API for H5 one-tap authorize 
POST /rbac/auth/wx-oauth-login exchanges code for openid and issues customer token.

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

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-30 15:16:55 +08:00
zzh
e0216e9692 feat: 销售产品贸易条款与查价分组展示，并修复用户资料 SQL 空值写入 
查价返回 DDP/DDU 与产品分组；用户更新微信二维码时避免 EF 使用 DBNull。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-30 11:48:36 +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
7fac6da1a4 fix: AI Agent 对话增加 /mcp/agent/chat，避免 OMS 反代漏配 /ai 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 12:41:50 +08:00
zzh
f72356f3f2 fix: 优化 AI Agent 查价/查轨迹提示，避免空回复与误要起运地 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 12:26:32 +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
41f4c58e99 Improve draft predeclare billing and structured create-fail payload. 
Re-run forecast billing on draft pre-declare, and expose draftSaved/orderId/serviceNo via ErrorCode/Data/details for clearer place-order failure UX.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 19:30:27 +08:00
zzh
03f11a276f Add order attachment files table and move system labels off Order. 
Persist generated/printed/downstream labels in t_order_file, drop Order.LabelUrl generate-status fields, and expose file list/upload/delete APIs with customer read-only systemLabel access.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 16:32:55 +08:00
zzh
e2443ed6f8 fix: restore country+weight price-check estimates for postcode zones. 
When rules require postal codes, still quote by same-country snapshot zones as estimated; keep blocking countries not configured at all.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 11:14:12 +08:00
zzh
c8d35a8ef5 Add Swagger summaries for Fake.Rbac menu/org/role/permission APIs. 
Cover the 29 RBAC endpoints that ship without XML comments so Swagger UI shows Chinese titles.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 10:33:48 +08:00
zzh
6f436f795f Fix downstream forecast success detection and persist provider service no. 
Treat itfx body code/msg as business result, store full request/response, and write Data.serviceNo/trackNo back to the order.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 10:21:23 +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
28d14034bd fix: exclude domestic pickup products from price check 
When destination country has no matching zone, stop using all price zones as fallback; also hide sales products in the domestic pickup group from price-check results and shipping options.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 16:00:58 +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
f53571aa48 fix: optimize WeChat scan-login reply copy for H5 and PC 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 10:03:38 +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
71fbbf54c0 docs: add Chinese XML summaries for Channel/Order/RBAC Swagger APIs 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-24 11:29:21 +08:00
zzh
944b7f2c80 fix: restore UTF-8 Chinese summaries for marketing swagger names 
Replace corrupted ??? XML comments in commission/referral admin APIs so OMS-Marketing operation names render correctly.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-24 11:25:15 +08:00
zzh
60cb2c5e0f fix: document marketing APIs and hide Order batch helpers from Swagger 
Add Chinese XML summaries for OMS-Marketing endpoints, and mark OrderService batch worker methods internal to stop OMS-Order swagger generation conflicts.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-24 11:09:55 +08:00
zzh
8f043599ec feat: enrich marketing admin APIs and add seed for customer 9/8 
Add referrer-list aggregation, customer-code filters, and idempotent marketing seed data with customer 9 as referrer and 8 as referee.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-24 10:44:26 +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
a4d7c89e44 fix: resolve track ApiCode from product and channel publish snapshots 
Read SupplierCode from rules publish snapshots before falling back to live itfx metadata so UpsertSmallBag gets apiCode at order create time.
 2026-07-23 10:49:19 +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
6314790598 feat: persist track upsert response in batch job item resultJson 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-23 09:28:34 +08:00
zzh
1545bc385f feat: ????????????? A0101/A0301/A0701 
Fix UpsertSmallBag ApiCode/TrackNo assembly and MQ-disabled direct fallback; append lifecycle tracks on parcel create, inbound, and outbound. Redact channel fields for customer order list.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 20:11:25 +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
c2d854b83f fix: 批量任务详情查询不再写库，修复 ConcurrencyStamp 冲突 
- MapJobOutputAsync 改为只读聚合，GET /jobs/{id} 不再 UpdateJob
- /jobs/{id}/items 仅校验存在，避免并行查询双写
- 重写 migrate_rename_warehouse_C_to_c.sql，支持 Navicat 与大小写两步改名

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 16:51:13 +08:00
zzh
a1daea6b35 refactor: 仓储表 C_* 改为 c_*，优化专线小包批量模板 
- 仓储实体与 db.sql 统一为小写 c_ 前缀，新增 migrate_rename_warehouse_C_to_c.sql
- 专线小包批量模板精简版/标准版双模板，Excel 必填标红与发件地址上传参数

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 16:18:59 +08:00
zzh
d791f7b251 fix: 批量任务插入后回填 JobItemId，修复 MQ 消费后仍待处理 
InsertItemsAsync 批量插入后按 MessageId 回填自增 Id；消费者支持 JobItemId=0 时按 JobId+MessageId 解析子项。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 15:12:41 +08:00
zzh
ab63920e85 chore: 触发 CI 重新构建发布，部署 OrderTask 合并后的上传接口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 12:55:08 +08:00
zzh
bb09a51f4a refactor: 合并 OrderTask 至批量任务，移除 t_order_task 依赖 
Excel 导入与任务进度统一走 t_order_batch_job；删除旧实体、仓储与 /order/task/* 接口，上传返回 jobId。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 12:36:57 +08:00
zzh
377cc525d6 feat: 增强批量任务子项反馈与客户单号持久化 
统一成功/失败结果快照，补全客户单号与 Excel 行号；系统重试耗尽后标记失败避免子项长期停留在执行中；任务 API 返回 pending/running/cancelled 计数。
 2026-07-22 12:00:53 +08:00
zzh
fc92e2903b fix: 字典列表分页改用 RepositoryPageHelper 避免 Where 丢失 
Fake GetPagedListAsync 带 sorting 时 total 正确但 items 返回全表；dictType 筛选已生效但被该 bug 掩盖。
 2026-07-22 11:06:21 +08:00
zzh
793085607a refactor: 字节枚举整型落库并统一发布快照 Status 
发布记录 Status 改为 EsSnapshotStatus(TINYINT)，计费启用判断改用 EnableStatus；db.sql 与 migrate_enum_int_comments.sql 补全枚举字段注释及旧库迁移。
 2026-07-22 10:22:54 +08:00
zzh
dd2abab42b fix: 字典类型项数统计按 trim 后 DictType 分组汇总 
避免类型编码首尾空格导致左侧菜单 itemCount 匹配失败。
 2026-07-22 09:25:00 +08:00
zzh
5a2d56986a fix: 字典创建支持恢复软删项并完善类型迁移脚本 
批量导入时若同类型编码曾被软删，改为恢复并更新而非插入，避免唯一键冲突 500；迁移脚本补全预置类型中文名并支持覆盖 Remark/TypeSort。
 2026-07-21 18:49:59 +08:00
zzh
93cf065165 feat: 新增字典类型元数据表与类型备注 API 
支持字典类型备注维护及左侧类型列表查询，创建字典项时自动补齐类型元数据。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-21 17:48:42 +08:00
zzh
dcf856568e fix: 批量任务系统失败重新抛异常以触发 EventBus 重试 
Restore InvalidOperationException on system failures after EventBus refactor; use OrderTaskStatusCodes when syncing import tasks.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-21 17:38:03 +08:00
zzh
365f9d8a94 fix: 数值枚举从 1 起编并统一 OrderTaskStatus 常量 
Reserve 0 as None for byte enums and align customer group labels with dict codes; add OrderTaskStatusCodes for import task status strings.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-21 17:37:54 +08:00
xiaolipro
32753e7606 简化 2026-07-21 10:45:57 +08:00
xiaolipro
98664aad3b fix 2026-07-21 09:12:46 +08:00
xiaolipro
d49efcb341 upgrade 2026-07-20 20:48:15 +08:00
xiaolipro
a4d6400318 refactor: 订单批量任务改走 Fake.EventBus.RabbitMQ 
移除自建消费者与队列拓扑，统一由事件总线发布/消费，并优化下游转发查询与配置。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-20 17:54:29 +08:00
zzh
188aed1ee6 feat: 店铺订单创建物流/代发，并补齐收件人字段与种子数据 
- 新增 batch-create-logistics / batch-create-fulfill：按平台行建物流单并回写 LinkedOrderId，代发支持绑定冻结与失败回滚
- ParcelBuilder 支持无 SKU 映射的平台行申报；批量创建可指定 OrderSource=platform
- 库存绑定候选接口支持 orderId=0 草稿选仓
- 店铺订单增加结构化收件人字段（db.sql + 迁移脚本），拉单回填；补充 customer9 店铺/揽收种子与 ConcurrencyStamp 修复脚本

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-19 22:33:55 +08:00
zzh
2b9c677fa7 perf: 登录单次快照、refresh 去 UserInfo，并失效角色菜单缓存 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 23:39:29 +08:00
zzh
b0813ea12d fix: 登录 UserInfo 构建改为串行查询，避免 DbContext 并发异常 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 23:26:47 +08:00
zzh
2188a3ce6e perf: 登录带回 userInfo，并加速 get-current-user 
登录/刷令牌返回完整用户信息（含 menus）；用户资料与权限并行查询并缓存 3 分钟，减少登录后二次慢请求。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 23:13:24 +08:00
zzh
e1f40ce36c fix: 显式注册面单 PDF 服务与 ILabelPdfRenderer，修复打印激活失败 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 19:19:44 +08:00
zzh
8929ebc5b3 refactor: 面单字段字典去掉发件人组，单号组按标题字数排序 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 19:10:41 +08:00
zzh
7bc7cdf417 fix: 批量队列消费者串行处理，避免 channel 并发导致消息长期 Unacked 
AsyncEventingBasicConsumer + Prefetch>1 时 IModel 非线程安全，并发 Ack 易卡死；改为同队列串行消费并加固 Ack/Nack。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 18:22:26 +08:00
xiaolipro
2d229bbedd fix 2026-07-18 17:27:34 +08:00
zzh
b679151eb1 feat: Hiprint模板转QuestPDF异步出面单，并接通打印链路 
支持模板预览/字段字典、产品绑定 LabelTemplateId、订单 Pending→Ready 生成 PDF，以及 order/print、批量与仓内 printUrl。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 14:52:39 +08:00
zzh
9957b79b19 feat: 打印面单扫码核对 lookup（运单/客户单/跟踪号/包裹/SKU） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 12:53:35 +08:00
zzh
fd9f57bac1 feat: SKU/入库预报返回客户信息，库存出入库历史与可用冻结量 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 12:07:07 +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
dc3071c90d feat: 物流单绑定包裹/库存（冻结可用库存） 
支持我的订单对已创建物流单绑定仓储资源：新增 t_order_stock_bind 与 stock-bind API，库存/包裹增加 FrozenQty、AvailableQty。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 10:32:44 +08:00
xiaolipro
039cbba3d1 feat：fake 2026-07-17 17:43:13 +08:00
zzh
fc823ed24e feat: 工作台统计补充店铺数量与待处理店铺订单，包裹单号前缀改为 ID 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-17 14:17:00 +08:00
zzh
a9338a4b25 feat: 揽收订单与列表支持管理端按客户筛选 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-16 12:41:20 +08:00
zzh
1cf55b2669 fix: 地址簿管理端可查全部，修复 SqlSugar 条件翻译 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-16 12:30:30 +08:00
zzh
9a48ec1a63 feat: 店铺订单拉单同步、RTS 与重新获取面单 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-16 11:38:06 +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
674cbdd011 feat: 店铺真授权跳转与地址类型（发件/退件/收件） 
对接 Lazada/Shopee/TikTok/Temu OAuth 与回调落库，移除手工店；地址管理支持按类型默认与揽收校验。

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

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-15 18:58:48 +08:00
zzh
4b7c396d92 包裹明细增加商品图片 ImageUrl，支持采集落库与列表返回。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-15 14:32:55 +08:00
zzh
d73c98b44e 修复列表分页丢Where：改用GetListAsync分页，状态筛选生效。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-15 13:45:08 +08:00
zzh
3d0db418d2 修复列表状态Tab将all误当状态筛选，并完善插件草稿TTL与客户上下文。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-15 12:46:05 +08:00
zzh
f0d0659750 包裹明细增加 AttributeText 属性字段。 
EOF

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 20:10:39 +08:00
zzh
d0df7e864c 新增快递到仓 API 与表结构，并支持 SKU 图片上传。 
EOF

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 20:06:47 +08:00
zzh
600ab37594 统一 OMS DDL 到 db.sql，并新增采集插件草稿 API。 
清理 sql/ 增量与种子脚本；E2E 不再依赖种子；PluginBrowserService 对接哪哪发「我的包裹」采集。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 19:44:09 +08:00
zzh
7e90112cbf 完善仓储客户上下文解析（未传客户查全部），并补充库位与确认收货权限种子。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 11:12:41 +08:00
zzh
c36bdb237c 重构客户编号生成规则，并修复店铺订单 summary SQL 翻译错误。 
采用年码+月码+序号编码（5/6位，单月最多10000）；summary 接口改用 hasStoreFilter 避免 SqlSugar 生成非法 SQL。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 17:54:29 +08:00
zzh
86a978b557 修复仓储与店铺订单列表 SqlSugar 可空筛选条件 SQL 翻译错误。 
列表 predicate 改用 hasWarehouseFilter/hasStoreFilter 等本地变量，避免 ORM 生成非法 SQL。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 17:15:06 +08:00
zzh
c2d7b5c854 修复店铺列表 ExpirationFilter 嵌套三元导致 SqlSugar IIF 翻译失败。 
按 expired/within7days/normal 分支构造独立 predicate，与充值等模块写法对齐。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 17:10:31 +08:00
zzh
fb61fbb072 修复仓储/店铺列表 ConcurrencyStamp 缺失与可空客户ID的 SQL 翻译错误。 
补迁移脚本为 C_* 与 t_sales_* 表增加 ConcurrencyStamp；列表查询改用 hasCustomerFilter 模式避免 ORM 生成非法 SQL。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 16:48:05 +08:00
zzh
36fb191f94 修复管理端访问仓储与店铺接口时客户ID必填报错。 
列表/汇总/详情改用 ResolveListCustomerIdAsync，管理端未传 customerId 时可查询全部数据。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 16:14:44 +08:00
zzh
8000162f02 docs: 仓储与店铺接口补充 Swagger 中文命名 
为 WarehouseService、PlatformStoreService、PlatformStoreOrderService 全部新增接口添加 XML 注释，便于 Swagger 中文展示与前端对接。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 15:46:32 +08:00
zzh
a383ee6f32 feat: 实现仓储模块与平台店铺订单后端能力 
新增仓储领域实体、仓储库、WarehouseService 全套接口及数据库迁移脚本；
实现店铺授权、店铺订单服务与库存匹配创建小包单；补充仓储模块 RBAC 权限种子数据。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 15:19:35 +08:00
zzh
18b53de20c fix: 批量邮件 SMTP 改用 MailKit 修复 SSL 465 连接 
替换 System.Net.Mail，正确支持隐式 SSL 与 STARTTLS，解决 Syntax error 测试连接失败。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 11:59:01 +08:00
zzh
8ac7e6487c feat: 优化公告通知接收人过滤与客户删除同步 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 11:22:21 +08:00
zzh
36525ca688 fix: 微信注册头像仅写入客户表避免 RBAC Avatar 超长 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 10:26:50 +08:00
zzh
9d57d221af fix: 微信注册软删除占坑与字段过长导致保存失败 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 10:15:38 +08:00
zzh
5e26c5bcec fix: 微信注册保存失败提示与订单模板申报字段推导 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 09:52:44 +08:00
zzh
43563b727f feat: 自动触发公式引擎与查价运输方式分组接口 
实现中文公式预报前拦截、规则测试 API 及按销售产品分组返回查价运输方式选项。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-09 18:36:17 +08:00
zzh
27e7ade388 feat: 销售产品对客说明字段与保存接口 
支持 CustomerGuideMarkdown 存储、迁移脚本及 customer-guide/save API，完善销售产品详情输出。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-09 15:17:36 +08:00
zzh
3818ce7876 feat: RBAC用户扩展、专属顾问接口及仓库字段清理 
接管用户 API 支持电话/工号/微信号/微信二维码，新增客户专属顾问查询，并移除仓库客服电话与微信相关字段。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-09 11:23:54 +08:00
zzh
d8752959e7 feat(order): 强化小包下单规则并暴露预报失败原因 
客户单号必填且同客户唯一，运单号统一 NE 前缀自动生成；模板导入不再接受跟踪号/运单号；列表与导出返回预报失败原因字段。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-09 09:44:12 +08:00
zzh
7d5bc2408f fix(order): 批量导入回写订单 ID 并增强 Excel 表头映射匹配 
导入行成功后写入 batch job 的 orderId/serviceNo；预报失败时尽量关联草稿订单。Excel 读取与行映射支持表头归一化，兼容带括号说明的列名。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 18:34:59 +08:00
zzh
fc22d9c6c6 feat(order): 优化标准模板 Excel 生成并支持保存映射时选择标准模板 
标准模板仅保留中文表头、必填标黄与枚举下拉；导入起始行改为第2行；保存自定义映射时可指定 standardTemplateKey。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 17:23:19 +08:00
zzh
9ab112a36e feat(order): 下单模板映射与 Excel 批量导入小包创建 
新增专线小包标准模板生成、自定义列映射 API，并将 /order/upload 改为按映射解析 Excel 后走 CreateParcelCoreAsync；列表查询时自动补齐标准模板种子数据。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 16:42:22 +08:00
zzh
7ab6b6fb51 refactor(order): 移除链路演练功能 
删除模拟签收 API 与 RBAC 菜单/权限种子，E2E 测试回退至待上网状态。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 12:41:59 +08:00
zzh
c918faec97 feat(order): 订单链路演练签收 API、E2E 测试与批量任务 SQL 修复 
补充链路演练模拟签收接口、E2E 主数据/菜单种子与测试项目，并修复批量任务列表 SqlSugar 查询及表结构注释脚本。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 11:32:45 +08:00
zzh
4f3bbd17bc feat(order): 订单批量任务 RabbitMQ 异步处理与治理 API 
引入批量 Job 表、RabbitMQ 队列与消费者，支持导入/小包创建及我的订单批量操作异步化，并提供任务列表、重试失败、取消 pending 与 DLX 监控接口及测试。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 09:52:22 +08:00
zzh
dd5c82e523 feat(order): 支持订单详情手动添加费用项 
新增 OrderFeeAddInput 并在 OrderEdit 服务中实现费用追加逻辑，配合前端订单详情抽屉添加费用能力。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-07 12:36:18 +08:00
zzh
74151b0738 feat(customer): 列表返回 Id 并支持管理员代登客户门户 
补充客户分页 Id 字段与 customer-oms-login 接口，修复管理端删除/免密登录；公告通知增加接收人候选项与客户接收类型。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 18:35:46 +08:00
zzh
90f6c25b04 feat(order): 问题件/理赔件标记、通知投递与自动触发 
新增 mark-problematic/mark-claimed/handle-status 接口，异常事件审计表与占位符渲染；inApp/email 通知及下单/入库/出库自动触发运行时。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 16:46:52 +08:00
zzh
9359c9cb5b fix(channel): 修复 inApp 通知方式被 Normalize 误过滤 
统一映射为 canonical code inApp，并修正站内信显示名匹配。
 2026-07-06 15:39:22 +08:00
zzh
0c763f9707 fix(channel): 修复问题模板重复校验 SQL 语法错误 
避免 SqlSugar 翻译闭包 null 比较，改用分支与布尔标志构建查询条件。
 2026-07-06 15:28:01 +08:00
zzh
d49573fe9a feat(channel): 新增问题模板 CRUD 与 options API 
支持按组织与问题类型维护通知模板，含建表脚本与仓储层唯一性校验。
 2026-07-06 14:58:37 +08:00
zzh
cde0ccb6b0 feat: 新增工作台与实时监控统计 API 
- GET /order/workplace-stats 与 /order/workplace-trend 供工作台使用

- GET /monitor/overview 供实时监控页订单/客户/轨迹统计

- 扩展订单仓储聚合查询，status-counts 同步应用数据权限

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-04 18:24:48 +08:00
zzh
991ad49255 fix(微信): 加固 GET 验签，直接输出 echostr 原文 
- 从 Query 读取 signature/timestamp/nonce/echostr 并记录失败原因

- 验签通过后 WriteAsync 写回 echostr，避免 JSON 包装

- 补充生产 Token 验签集成测试

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-04 13:43:42 +08:00
zzh
da1227d8aa feat(微信): 消息推送支持明文 XML/JSON 验签与回包 
- POST /apiwechat/verification 恢复消息回调，支持 JSON/XML 明文包体

- SHA1 验签通过后 GET 原样返回 echostr，POST 无回复时返回 success

- 补充官方验签示例与 JSON/XML 推送集成测试

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-04 12:52:43 +08:00
zzh
6c2e095196 fix(微信): 验签接口仅保留 GET 并原样返回 echostr 
- /apiwechat/verification 移除 HEAD/POST，仅保留 GET 验签

- 验签通过后从 Query 原样返回 echostr 纯文本

- 扫码回调测试改走 /wechat/mp/{appId}

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-04 12:30:42 +08:00
zzh
0a5bd75618 feat: 新增财务应收应付接口并补充 Swagger 接口名称 
- 新增 Finance 模块应收应付分页查询及订单费用联查

- 为 DataPerm、Xhs 等缺失接口补充中文 summary 接口名称

- 优化微信公众号验签 Swagger 命名并补充路由集成测试

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-04 12:15:15 +08:00
zzh
11520d014b fix(数据权限): 修复 DataScopeContext 缓存 JSON 反序列化失败 
将 IReadOnlySet/IReadOnlyList 改为 HashSet/List 等可序列化类型；缓存读取失败时自动重建。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-03 17:47:29 +08:00
zzh
5f1f16c9ad fix(数据权限): 组织树递归查询使用 ParentId 而非 PId 
修复 get-effective-by-user 展开下级组织时报 Unknown column c.PId。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-03 16:44:46 +08:00
zzh
0bf909dc2b feat(rbac): 新增内部用户列表接口，排除纯客户账号 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-03 12:19:14 +08:00
zzh
ad367998d2 fix(数据权限): 修复 GUID 种子/SqlQuery 映射并补充诊断修复 SQL 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-03 11:58:24 +08:00
zzh
c442833d9c feat(数据权限): 实现 P1 后端 API、有效范围合并与订单列表集成 
- 新增 DataPerm 模块（配置 CRUD、模板、字段脱敏、变更/访问日志 API）及 SQL 脚本
- 订单列表/导出接入 EffectiveScopeBuilder 五维数据权限过滤
- 修复集成测试 JSON 反序列化与 RBAC 用户名解析；新增 DataPerm API 集成测试

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-03 10:27:37 +08:00
zzh
02cb06b86c feat(wechat): 完善扫码登录缓存账号信息与轮询状态接口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-02 15:51:59 +08:00