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

270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
xiaolipro
ed0bda4b7f Merge remote-tracking branch 'origin/master' 2026-07-22 14:19:56 +08:00
zzh
ab63920e85 chore: 触发 CI 重新构建发布，部署 OrderTask 合并后的上传接口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 12:55:08 +08:00
zzh
078e3387e6 chore: 触发重新发布，修复上传仍访问 t_order_task 的问题 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 12:50:16 +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
1d4b1c9665 Merge branch 'master' of https://github.com/xiaoliutral/SimpleAdmin.Api 2026-07-22 12:08:47 +08:00
xiaolipro
d6fcc0c88a Merge remote-tracking branch 'origin/master' 2026-07-22 12:05:59 +08:00
xiaolipro
4bf2450cc9 upgrade fw 2026-07-22 12:05:39 +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