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

171 Commits

Author SHA1 Message Date
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
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
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
zzh
983dff12c5 feat: 店铺订单落库物流商与履约类型，并规范迁移脚本日期命名
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 18:01:46 +08:00
zzh
7a611f8cf7 fix: TikTok 准备发货改为真实 shipPackage，并回写面单状态
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 17:31:19 +08:00
zzh
9c97a218ec fix: TikTok 拉单按订单详情映射收件人金额行商品并落库
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 16:59:28 +08:00
xiaolipro
1540a74d52 Merge remote-tracking branch 'prod/test' into test
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
Details
2026-10-16 14:59:30 +08:00
xiaolipro
d72637e472 优化order/parcel/create 2026-10-16 14:55:37 +08:00
zzh
c6e765e6e2 fix: 公告列表用 mapId 解析当前用户，管理端可查全部
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
同步监控 overview 支持日周月经营指标与积压队列。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 09:48:42 +08:00
zzh
aa4c4a28e6 fix: 排货后创建轨迹订单转发创单时的 Authorization
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
消费端没有登录态会导致轨迹网关 401；创单时写入预报任务再带到轨迹事件。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-15 09:23:15 +08:00
zzh
5fd25d479c fix: 去掉创单后置步骤表，轨迹订单改在排货成功后创建
All checks were successful
Build and Deploy / deploy (push) Successful in 1m6s
Details 
回到创单提交后各自投递；并在下单接口注释同步与 MQ 步骤。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-15 09:05:26 +08:00
zzh
34c47a3173 fix: 创单后置步骤随订单落库，提交后再单独执行
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
进程重启或事务回滚不再丢掉 9610、轨迹和揽收；排货完成后再补轨迹、面单和计费相关触发。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 20:07:51 +08:00
zzh
61b6f9a9b9 fix: 创单事务释放后再提交 9610、轨迹和揽收事件
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
避免在创单事务里写 Outbox 征用不到连接，导致这三类事件被丢掉。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 19:37:56 +08:00
zzh
79fa20a9ca fix: 创单成功后把预报计费和后续事件拆开提交
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
预报计费失败不再把订单留在处理中，轨迹、面单和自动触发在创单提交后各自入队。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 19:23:07 +08:00
xiaolipro
7b69bbf207 test
All checks were successful
Build and Deploy / deploy (push) Successful in 1m4s
Details
2026-10-14 17:07:35 +08:00
zzh
b7be742046 feat: 店铺订单支持仓储代发(wms)建单，放宽创建状态限制
All checks were successful
Build and Deploy / deploy (push) Successful in 4m34s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 15:39:31 +08:00
zzh
e85dfb80b5 feat: 仓配开放 API 与后台用户启停
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
新增 warehouseOpenApi（Token/入库/件重尺/红外图），并在 fk_user 支持 IsEnabled 禁用登录。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-13 17:53:00 +08:00
zzh
32156dcfe0 fix: 轨迹订单 trackNo 仅取跟踪号，变更后重新 Upsert
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 19:20:09 +08:00
zzh
fa9777bd08 fix: SqlSugar 与 EF Outbox 连接冲突时回落短事务
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
发布集成事件前先挂 Outbox 上下文；连接不匹配时 RequiresNew 写 Outbox，避免预报等按钮报 transaction not associated。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 19:01:15 +08:00
zzh
6c3a094126 feat: 下游 getFile 转存 COS，并修复集成事件 Outbox 事务
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
新增获取下游文件接口；事件发布统一走事务性 UoW，避免批量预报等按钮报 Outbox 错误。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 18:45:40 +08:00
xiaolipro
957ea62f70 Merge pull request '1.03' (#4) from mq into test
Some checks failed
Build and Deploy / deploy (push) Has been cancelled
Details 
Reviewed-on: #4
 2026-10-10 16:46:05 +08:00
xiaolipro
586a6b6834 change 2026-10-10 16:41:28 +08:00
zzh
8df0f37165 feat: 订单编辑支持服务商单号并完善操作日志快照
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
开放 DownstreamServiceNo 更新，补充包裹计费相关操作码与字段快照，便于运单详情编辑留痕。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 16:27:49 +08:00
zzh
64737284f3 feat: 运单操作日志改为列表摘要，补齐费用/支付/预报/打印埋点
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 11:46:33 +08:00
zzh
dcd985bca4 feat: 创单/出入库后置副作用接入 Fake.EventBus，预报计费排货走 MQ 
将轨迹、面单、9610、揽收、自动触发与 ForecastBilling 异步化，缩短扫码与下单 RT；队列未启用时同步回落。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 10:54:24 +08:00
zzh
da27fa4377 feat: 重算应付放行锁渠道池校验，支持切换价格/规则版本与服务商名称
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-09 18:16:38 +08:00
zzh
2b0158acb4 feat: 运单操作日志 MVP，记录编辑/件重尺/重算/排货字段变更
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-09 17:32:33 +08:00
zzh
358738c333 feat: 揽收单支持改信息/件重尺/重算费用，创建后自动预报下游
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
创建成功后自动下游预报回写承运单号并升为已预约；详情可改揽收信息与件重尺并按卖买价重算。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-09 16:12:12 +08:00
zzh
9e5d6d20d5 feat: 会员概览补充等级编码与图标，收发件人国家返回二字码
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 17:34:32 +08:00
zzh
35156eedf4 feat: 渠道买价/规则发布钉 KPI 分区包，排货应付按渠道价区解析
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
各渠道异构价区与偏远不再复用产品卖价 zoneKeys；发布只存包引用，计费 hydrate 后硬失败。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 17:19:39 +08:00
zzh
bb8c0a906c feat: 卖价/规则发布钉 KPI 分区包，快照只存引用
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
分区明细独立版本化并缓存加载，计费包缺失严格失败；同步态接口不再拉全文。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 16:42:42 +08:00
zzh
6faadcf2a1 feat: 卖价支持多价格分区表，列表返回创建/修改人
All checks were successful
Build and Deploy / deploy (push) Successful in 1m7s
Details 
合并多 Area 分区规则进发布快照，计费用规则自身 AreaId 匹配；产品与渠道列表补 CreateBy/UpdateBy。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 10:57:21 +08:00
zzh
f972a28d79 feat: 落地滚动会员、券发放与邀请分成奖励
All checks were successful
Build and Deploy / deploy (push) Successful in 3m50s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-06 17:40:24 +08:00
zzh
f063c99d1b feat: OpenAPI 增加轨迹/文件查询，创单按 clientNo 幂等 
客户 HMAC 通过后再查本客户订单；禁止下游面单，附件增加 POD。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-05 18:48:21 +08:00
zzh
b748aa4000 fix: 收紧分区 range、进位相接与仅国家估算口径
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
进位区间改为左开右闭且禁止空洞，邮编 range 按数字/字母数字比较，查价仅国家时不再串用别国 zone。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-05 17:35:18 +08:00
zzh
74a71991b2 feat: 统一价格/黑名单/偏远分区匹配，并落库 MatchDim
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-05 16:12:09 +08:00
zzh
87f4cebc9b feat: openApi 统一信封与推费字段对齐，下单鉴权改请求头
All checks were successful
Build and Deploy / deploy (push) Successful in 56s
Details 
推费入参对齐表字段；创建订单凭证走 appKey/appSecret Header，去掉上门揽收与 Body 内 customerId。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-30 12:17:50 +08:00
zzh
a3b54b6b07 feat: openApi 分组暴露推费与下单，去掉 OMS 侧 appKey 校验
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
Swagger openApi 提供 /openapi/pickup-order/push-fee 与 /openapi/parcel/create；删除 method 路由与 whoami。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-30 10:36:24 +08:00
zzh
955a3c8c6d fix: 揽收推费按承运运单号 CarrierWaybillNo 匹配
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 19:56:40 +08:00
zzh
5fb6888b55 feat: 揽收承运推送件重尺并按卖价买价出账
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 19:19:24 +08:00
zzh
24b8c29c9b fix: 9610预报下游回写下游单号兼容 serviceNo/orderNo
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 14:50:27 +08:00
zzh
8226542ffd fix: 9610预报下游网关地址改为取自 api_center 配置
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-28 14:33:52 +08:00
zzh
6c8f7cb781 feat: 9610汇总下单必填电商平台写入预报，并增强官网产品目录筛选项
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-28 14:25:11 +08:00
zzh
ddb8efba15 feat: 9610汇总下单关联出口资质，并补齐批量模板字段
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
下单/导入在 9610Summary 时校验并落库 ExportQualificationId（可回落默认备案），写入 9610 申报企业信息；专线小包模板长宽高改必填并增加资质备案列。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-24 16:12:39 +08:00
zzh
dd4644e914 feat: 揽收大包轨迹手动同步接口，并支持管理员重置密码
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
新增 track-upsert-big-bag 返回三步联调结果；补齐 reset-password API。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-24 15:00:36 +08:00
zzh
26c840cdb1 fix: 加固本地存储失败不回滚创单，并完善揽收大包轨迹同步
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
避免 /app/wwwroot 不可写时预报成功被回滚；同步推送 test 部署出口资质等已合入能力。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-24 09:51:02 +08:00
zzh
c9084ee5ca fix: 合并 master 后改用 IObjectStorage，对齐 fake oss
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-23 11:37:27 +08:00
zzh
5648163958 merge master into test: 揽收下游预报与近期功能，保留 fake oss 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-23 11:30:17 +08:00