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

257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
xiaolipro
32753e7606 简化 2026-07-21 10:45:57 +08:00
xiaolipro
98664aad3b fix 2026-07-21 09:12:46 +08:00
xiaolipro
f0f6f067ea upgrade框 架 2026-07-20 21:19:41 +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