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

147 Commits

Author SHA1 Message Date
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
8f64bbf02d feat: 国家地区支持增删改与导入，列表返回创建和更新时间
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 15:54:22 +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
8258ae746e feat: 客户更新接口支持局部字段，并补充开发/SQL 规范说明
All checks were successful
Build and Deploy / deploy (push) Successful in 1m7s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-15 19:53:24 +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
d5d6305f9c feat: 自动触发规则支持 Excel 导入与模板下载
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-12 15:31:19 +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
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
6852135774 feat: 仓库地址排序备注与用户注册错误提示
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
仓库地址增加排序/备注字段与迁移；用户创建时对邮箱冲突等给出明确中文提示。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-09 14:12:36 +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
ae4e733a71 feat: KPI 分区导入支持增量/全量，删除分区级联明细 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 17:34:31 +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
b38499963d feat: 销售产品页签按需加载版本头和渠道下拉，避免分页拉取整份快照
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 14:20:17 +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
8d7df40bdf feat: 销售产品独立改代码，分区明细导入保存按规则去重 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-06 15:37:03 +08:00
zzh
14c42db752 feat: 增加 /file-storage 接口，供附件预览按对象 key 流式读取
All checks were successful
Build and Deploy / deploy (push) Successful in 1m8s
Details 
补 normalize-key 与 stream，兼容带或不带 admin 前缀的 COS 路径。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-06 12:21:06 +08:00
zzh
5bf81b5138 fix: OpenAPI 轨迹/文件补 Swagger 请求体 schema 
FromBody 仅用于文档展示，验签仍读原始 Body。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-06 10:39:28 +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
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
1b6e91b09d feat: OpenAPI 鉴权改 HMAC 签名校验，并完善下单报文处理
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-30 17:33:46 +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
2688058cb3 feat: 客户 OpenAPI 机机凭证与 whoami 探针
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
一主客户一对 AppKey/AppSecret，支持门户自助与后台代管启停重置，供应商回调路径不动。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-30 10:19:38 +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
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
8ce8b82f48 feat: 客户出口资质备案与申报要素，9610 预报直连下游
All checks were successful
Build and Deploy / deploy (push) Successful in 1m49s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-22 18:13:55 +08:00
zzh
e5c9364434 feat: 排货规则支持判断条件公式并完善失败溯源
All checks were successful
Build and Deploy / deploy (push) Successful in 1m49s
Details 
用 MatchCondition 中文公式筛选可用渠道后再按方案选渠；失败时落完整排货过程（阶段、公式摘要、池汇总），并兼容旧 CustomerIds。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-17 19:43:05 +08:00
zzh
6b920cc49d fix: 对齐 createOrderOne 下游预报请求体，productCode 取预报渠道 code
All checks were successful
Build and Deploy / deploy (push) Successful in 1m46s
Details 
移除 channelCode 等多余字段，改用专用 ItfxCreateOrderOneBody。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-16 17:43:30 +08:00
zzh
8d1e3ab17f feat: 揽收方向与地址类型，补充迁移并清理已落地 SQL
All checks were successful
Build and Deploy / deploy (push) Successful in 1m47s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-13 23:34:55 +08:00
zzh
61d1502148 feat: 新增 /order/print/batch 同步批量返回面单地址
All checks were successful
Build and Deploy / deploy (push) Successful in 1m44s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-12 18:56:41 +08:00
zzh
87abcecb65 feat: 对账件重尺导入与应收只留一套
All checks were successful
Build and Deploy / deploy (push) Successful in 1m45s
Details 
新增 downstream 重量导入并锁定渠道重算应付；重算应收清空全部阶段；费用软删与查询过滤，避免预报入库叠算。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-12 16:57:28 +08:00
zzh
43fcb4136a feat: SkuImage 存 storage key，包裹 summary，修复批次测试
All checks were successful
Build and Deploy / deploy (push) Successful in 1m48s
Details 
避免签名 URL 超长写库；新增包裹状态汇总；OrderBatchJobCoordinator 注入 IFileStorage 后补齐单测。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-12 12:30:35 +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