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

423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zzh
e1c6e1b166 Merge pull request '20261030' (#18) from test into master
All checks were successful
Build and Deploy / deploy (push) Successful in 2m0s
Details 
Reviewed-on: #18
 2026-10-30 17:37:30 +08:00
zzh
9be7fcd143 fix: 客户公开注册接口允许匿名访问，避免注册页 401
All checks were successful
Build and Deploy / deploy (push) Successful in 1m11s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-30 17:33:04 +08:00
zzh
1f066f63c8 fix: 代理返佣导出触发状态改为中文订单状态名
All checks were successful
Build and Deploy / deploy (push) Successful in 1m13s
Details 
导出明细不再直接写英文/原始状态码，与门户展示口径一致。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-30 12:31:37 +08:00
zzh
07f589d57b feat: 代理返佣下单预计与 Outbox 异步落库
All checks were successful
Build and Deploy / deploy (push) Successful in 1m12s
Details 
下单写 estimated、终态锁定 pending、取消/退款 void；打款仅认 pending，写入走集成事件异步消费。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-30 11:06:51 +08:00
zzh
4b237c1374 fix: 代理运单列表按名下客户过滤
All checks were successful
Build and Deploy / deploy (push) Successful in 1m12s
Details 
门户可见范围改用客户当前 AgentId；返佣仍认订单快照 AgentId。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-30 10:52:16 +08:00
zzh
b6831bad1d feat: 代理门户能力与客户绑定代理改绑
All checks were successful
Build and Deploy / deploy (push) Successful in 1m14s
Details 
补齐工作台/名下客户订单返佣、注册校验与运营端客户 AgentId 改绑，订单列表按代理快照过滤。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-30 10:18:32 +08:00
zzh
0c89ec6ce5 fix: 代理迁移脚本补充 ConcurrencyStamp，避免 MySQL 1674
All checks were successful
Build and Deploy / deploy (push) Successful in 1m12s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-29 18:38:18 +08:00
zzh
1d987cde6e feat: 新增渠道代理注册归因与返佣明细
All checks were successful
Build and Deploy / deploy (push) Successful in 1m13s
Details 
独立 Agent 主体与 loginType=2，注册绑定/下单快照，派送成功失败计提明细，不含提现入账。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-29 17:18:07 +08:00
zzh
221a2c8a66 feat: KPI分区明细列表支持起始/截止邮编排序
All checks were successful
Build and Deploy / deploy (push) Successful in 1m13s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-29 16:37:33 +08:00
zzh
8a4848644f feat: KPI分区明细列表支持表头字段后端筛选
All checks were successful
Build and Deploy / deploy (push) Successful in 1m22s
Details 
EOF

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-29 16:04:02 +08:00
zzh
7f8d4cbe19 Merge pull request '2026102801' (#17) from test into master
All checks were successful
Build and Deploy / deploy (push) Successful in 1m55s
Details 
Reviewed-on: #17
 2026-10-28 16:34:24 +08:00
zzh
b87414aafd fix: 自动触发公式修复括号布尔组与 ||/&& 短路解析
All checks were successful
Build and Deploy / deploy (push) Successful in 1m11s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-28 15:40:14 +08:00
zzh
d20c10a2f2 feat: 自动触发公式支持有值/为空校验
All checks were successful
Build and Deploy / deploy (push) Successful in 1m12s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-28 15:07:40 +08:00
zzh
46455b2ae9 Merge pull request '20261028' (#16) from test into master
All checks were successful
Build and Deploy / deploy (push) Successful in 2m0s
Details 
Reviewed-on: #16
 2026-10-28 11:26:50 +08:00
zzh
ab37f59b1a feat: 品名可承运查询支持仅凭 cargoName 调用 oms.channel_guide
All checks were successful
Build and Deploy / deploy (push) Successful in 1m13s
Details 
客户问能不能寄/走什么渠道时强制调工具；无产品代码则按对客说明检索可走渠道。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-28 11:17:35 +08:00
zzh
fc48b84f80 fix: AI 对话解析多模型 JSON 配置，取 defaultModelId
All checks were successful
Build and Deploy / deploy (push) Successful in 1m12s
Details 
兼容 apiSecret 纯模型名与 {defaultModelId,models} 结构，避免多模型配置后请求失败。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-28 10:46:36 +08:00
zzh
efbb18c7c3 feat: AI 提供商列表明文回传默认模型，并按类型回落模型名
All checks were successful
Build and Deploy / deploy (push) Successful in 1m17s
Details 
ApiSecret 实际承载文字主模型，列表不再脱敏；未配置时 Chat 按厂商默认模型回落。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-28 10:32:59 +08:00
zzh
cb60028538 Merge pull request '订阅轨迹中心轨迹状态，变更运单状态' (#15) from test into master
All checks were successful
Build and Deploy / deploy (push) Successful in 1m56s
Details 
Reviewed-on: #15
 2026-10-27 17:50:21 +08:00
zzh
346f41c204 feat: 运单列表筛选补齐拦截/偏远/COD及处理状态等字段
All checks were successful
Build and Deploy / deploy (push) Successful in 1m12s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-27 09:48:01 +08:00
zzh
ff9a3ae8be feat: 订阅轨迹中心 TrackChange，按 D03/D09/D11 同步出库后订单状态
All checks were successful
Build and Deploy / deploy (push) Successful in 1m13s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-27 09:46:28 +08:00
zzh
fef409a4ce fix: 删除订单只改状态，已删除 Tab 可查
All checks were successful
Build and Deploy / deploy (push) Successful in 1m12s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-26 18:35:56 +08:00
zzh
6be97e7232 perf: 加速查价——批量快照、绑定缓存与并行算价
All checks were successful
Build and Deploy / deploy (push) Successful in 1m13s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-26 18:06:49 +08:00
zzh
8961fa9307 Merge pull request '20261026' (#14) from test into master
All checks were successful
Build and Deploy / deploy (push) Successful in 1m58s
Details 
Reviewed-on: #14
 2026-10-26 12:26:55 +08:00
zzh
5af567b519 chore: retrigger test deploy
All checks were successful
Build and Deploy / deploy (push) Successful in 1m12s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-26 12:00:00 +08:00
zzh
3c85b7325f feat: 运单发货后状态变更接口
Some checks failed
Build and Deploy / deploy (push) Failing after 45s
Details 
新增 ChangePostShipStatus，限制发货后四态白名单，妥投成功仅可进入不可改出。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-26 11:46:33 +08:00
zzh
a69e69d5b6 feat: 查价表单下拉支持匿名加载，供 H5 访客先选仓/国家/属性
All checks were successful
Build and Deploy / deploy (push) Successful in 1m44s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-26 10:04:09 +08:00
zzh
1caca3c357 fix: 入库箱唛按箱序号数值排序，避免超过 9 箱时乱序
All checks were successful
Build and Deploy / deploy (push) Successful in 1m14s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-24 14:48:41 +08:00
zzh
ae78834d7c Merge pull request 'fix: 运单列表 enrichment 改为顺序查询，避免 MySqlConnection 并发复用' (#13) from test into master
All checks were successful
Build and Deploy / deploy (push) Successful in 2m2s
Details 
Reviewed-on: #13
 2026-10-24 13:36:05 +08:00
zzh
ccb9c055a5 fix: 运单列表 enrichment 改为顺序查询，避免 MySqlConnection 并发复用
All checks were successful
Build and Deploy / deploy (push) Successful in 1m12s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-24 11:31:33 +08:00
zzh
d22fe7220d perf: 运单列表改为轻量映射，减小 /order/list 载荷与 enrichment 耗时
All checks were successful
Build and Deploy / deploy (push) Successful in 1m18s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-24 10:44:18 +08:00
zzh
af7909948e fix: 面单自定义文本支持 testData，并避免文本框高度裁切
All checks were successful
Build and Deploy / deploy (push) Successful in 1m11s
Details 
无 field 时按 title/testData 输出；框高至少字号×1.4，防止设计器矮框打成空白。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 14:50:23 +08:00
zzh
7b54eff764 fix: 面单 PDF 嵌入 CJK 字体，避免 Bold 回退导致中文 ???
All checks were successful
Build and Deploy / deploy (push) Successful in 1m10s
Details 
将黑体随程序嵌入 QuestPDF；页级默认中文字体，禁止对单 Regular 调 Bold。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 14:26:24 +08:00
zzh
88c89bd85e fix: COS access-url 重签剥掉 PathBase，避免 admin/admin NoSuchKey
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
自定义域 URL 带 /admin 前缀，归一化为 uploads/... 再 GetUrl，防止双重 PathBase。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 14:16:13 +08:00
zzh
1cef872823 fix: 箱唛增加箱子总数，QuestPDF 注册中文字体防乱码
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
入库箱唛字段 boxCount；渲染时嵌入 CJK 字体，镜像安装 fonts-noto-cjk。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 12:44:49 +08:00
zzh
ca95e19186 feat: SKU/预报下游申报明细带产品标识编码三字段
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
库内 SKU 与 createOrderOne items 对齐 productId/nonStdProductId/stdProductId；无值时仍序列化为 null。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 11:19:12 +08:00
zzh
f8cabe1909 Merge pull request 'fix: COS 签名 URL 过期时按 object key 重新签发访问地址' (#12) from test into master
All checks were successful
Build and Deploy / deploy (push) Successful in 1m49s
Details 
Reviewed-on: #12
 2026-10-23 10:18:22 +08:00
zzh
e48f8ce926 fix: COS 签名 URL 过期时按 object key 重新签发访问地址
All checks were successful
Build and Deploy / deploy (push) Successful in 1m7s
Details 
历史库内若存带 q-sign 的完整 COS 链接，打印/查看会 AccessDenied；写入只保留 key，读出时重新签名。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 10:12:07 +08:00
zzh
62d423ad4d Merge pull request 'test' (#11) from test into master
All checks were successful
Build and Deploy / deploy (push) Successful in 1m52s
Details 
Reviewed-on: #11
 2026-10-22 18:59:17 +08:00
zzh
6021562fea feat: 入库预报支持预报/待入库编辑，唛头选填
All checks were successful
Build and Deploy / deploy (push) Successful in 1m5s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-22 18:54:33 +08:00
zzh
8a1649ea66 feat: 入库箱唛/SKU 标签打印与订单改销售产品
All checks were successful
Build and Deploy / deploy (push) Successful in 1m13s
Details 
支持按 box/sku 模板生成 PDF；待支付前可改产品并自动重排货重算费。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-22 18:39:07 +08:00
zzh
7ed8fd8e8a feat: 店铺创建运单支持基本信息覆盖，无事务时同步执行创单副作用
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-20 11:23:15 +08:00
zzh
264c3a5dcb fix: 编辑订单跟踪号改为同步 Upsert，不再发 Outbox 事件
All checks were successful
Build and Deploy / deploy (push) Successful in 1m28s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-20 10:56:28 +08:00
zzh
45361e9eb5 fix: /order/update 加事务 UoW，跟踪号变更可写 Outbox
Some checks failed
Build and Deploy / deploy (push) Failing after 58s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-20 10:49:12 +08:00
zzh
34d46ed492 Merge pull request '1.06' (#10) from test into master
All checks were successful
Build and Deploy / deploy (push) Successful in 1m48s
Details 
Reviewed-on: #10
 2026-10-19 17:03:14 +08:00
zzh
e931606a75 feat: 9610 支持从已有运单批量创建汇总申报单
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
- 新增 POST /order/customs-9610/create-from-orders：运单设为 9610Summary 并绑定出口资质备案（空则客户默认），按申报明细生成待申报单
- 逐单返回结果：已删除、已有 9610 单、无申报明细、无可用备案记为失败，不影响其它运单
 2026-10-19 16:24:02 +08:00
zzh
314c5ac02f feat: 申报明细新增产品标识编码/非标产品标识编码/标准产品标识编码
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
Details 
- t_order_declaration 新增 ProductId、NonStdProductId、StdProductId（迁移 migrate_order_declaration_product_ids_20261019.sql）
- 下单/改单/开放接口/Excel 模板入参、订单详情出参、下游 createOrderOne 报文同步字段
- 自动触发公式目录增加三个字段
 2026-10-19 15:48:16 +08:00
zzh
d38963055b feat: 支付用券/会员折扣写入负数应收行，订单应收与实付一致 
- 支付成功后写入 coupon_discount / member_discount 负数应收（币种、阶段跟随运费行，记录券码/会员等级）
- 营销重算的折前应收排除抵扣行，避免重复扣减；规则公式忽略抵扣行
- 预报/入库计费任务跳过已付款订单，防止重复投递冲掉应收
- 手工新增费用禁止抵扣费用项；费用输出给出抵扣行显示名
- 订单详情返回折前小计、会员折扣、优惠券抵扣、客户实付
- 新增 fee_item 字典迁移 migrate_fee_item_marketing_discount_20261019.sql
 2026-10-19 15:48:15 +08:00
xiaolipro
ce75fca721 Merge remote-tracking branch 'prod/test' into test
All checks were successful
Build and Deploy / deploy (push) Successful in 1m5s
Details
2026-10-19 15:08:16 +08:00
xiaolipro
4418217b01 upgrade 29 2026-10-19 15:08:05 +08:00
zzh
223d32f62a feat: 订单支付时选券，新增支付预览接口并按所选券扣款核销
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
Details 
- 新增 GET /order/pay-preview：返回会员折/券互斥后的应付拆解与本单可选券
- POST /order/pay 支持 couponInstanceId（null 沿用已绑定券，0 不用券，>0 指定券），按试算应付扣款并核销券、释放被替换券的锁定
- 被当前订单锁定的券视为可用，修复入库/编辑重算营销金额时误报券被占用

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-19 14:01:00 +08:00