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

254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiaolipro
c886e8cef3 Merge remote-tracking branch 'prod/master' 2026-09-09 14:36:10 +08:00
xiaolipro
8f7a4c1405 Merge remote-tracking branch 'origin/master' 2026-09-09 14:35:46 +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
ef12db52a0 更新 .gitea/workflows/deploy.yml
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
触发构建
 2026-09-07 16:16:15 +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
xiaolipro
93bef462fb feat: 迁移到gitea 2026-09-05 16:33:28 +08:00
xiaolipro
4fcc0bf7a9 Merge remote-tracking branch 'origin/master' 2026-09-05 16:30:27 +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
xiaolipro
da257affae Merge remote-tracking branch 'origin/master' 2026-08-01 09:15:17 +08:00
zzh
ce897101fe chore: rebuild and redeploy admin_api 
Local Release build/publish succeeded; re-trigger CI after previous deploy failure.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-31 21:26:43 +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