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

284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2836601062 chore: retrigger test deploy for 9610 downstream forward
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 12:17:04 +08:00
zzh
3bde909238 feat: 新增大包轨迹同步下发 apiCode
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-28 16:58:00 +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
zzh
26f9d8be7f feat: 揽收单预报下游改从 t_pickup_order 组装 createOrderOne
All checks were successful
Build and Deploy / deploy (push) Successful in 1m43s
Details 
新增 /order/pickup-order/downstream-forward，productCode/supplierCode/地址重量商品均取揽收单，不再依赖关联物流单。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-22 19:17:09 +08:00
zzh
623db4ffdb fix: 服务渠道分组软删同名可恢复，并修正 COS 自定义域名签名
All checks were successful
Build and Deploy / deploy (push) Successful in 1m44s
Details 
同名软删分组创建时恢复记录，更新时释放唯一键冲突；COS 自定义 CDN 域名关闭 signHost，并补充常见图片 Content-Type。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-22 19:00:12 +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
xiaolipro
dd1318bc00 feat：对接fake oss
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details
2026-09-22 16:59:33 +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
14f3df3fa5 fix: 下游预报凭证快照整套同源，避免与订单字段混拼
All checks were successful
Build and Deploy / deploy (push) Successful in 1m45s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-14 18:13:37 +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
0fdc9e29f4 feat: API中心其他配置与面单 COS 流代理
All checks were successful
Build and Deploy / deploy (push) Successful in 1m52s
Details 
将 itfx 网关优先读其他配置 api_center（含 AppKey/AppSecret 回退），面单预览经服务端代理拉取 COS。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-12 17:40:52 +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
40997f7d71 feat: 新增 /file-storage/stream 供面单预览鉴权读取
All checks were successful
Build and Deploy / deploy (push) Successful in 1m46s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-11 19:14:26 +08:00
zzh
d1d31fee8a fix: 仓储图片上传支持 customerId，9610 明细补并发戳且主从安全
All checks were successful
Build and Deploy / deploy (push) Successful in 1m43s
Details 
上传接口接受 query customerId；ConcurrencyStamp 默认改为空串并用主键确定性回填，避免 Galera UUID unsafe。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-11 12:09:36 +08:00
xiaolipro
d1e3672808 feat：cos
All checks were successful
Build and Deploy / deploy (push) Successful in 1m47s
Details
2026-09-11 11:34:59 +08:00
xiaolipro
56c18c0343 feat：加强cos log
All checks were successful
Build and Deploy / deploy (push) Successful in 1m41s
Details
2026-09-10 18:00:18 +08:00
xiaolipro
943ba539a4 feat: cos
All checks were successful
Build and Deploy / deploy (push) Successful in 1m43s
Details
2026-09-10 17:32:49 +08:00
xiaolipro
23eb80931a Merge remote-tracking branch 'prod/master' 2026-09-09 15:52:35 +08:00
zzh
0a16f27664 fix: 修复微信 mp 路由 regex 导致生产启动失败
All checks were successful
Build and Deploy / deploy (push) Successful in 32s
Details 
ASP.NET 路由模板中方括号需转义为 [[ ]]，否则应用在 InitializeApplication 阶段崩溃。
 2026-09-09 15:31:54 +08:00
xiaolipro
c886e8cef3 Merge remote-tracking branch 'prod/master' 2026-09-09 14:36:10 +08:00
xiaolipro
8f7a4c1405 Merge remote-tracking branch 'origin/master' 2026-09-09 14:35:46 +08:00
zzh
41db6fa0af chore: 生产/测试配置分离，并收紧微信 mp AppId 路由
Some checks failed
Build and Deploy / deploy (push) Failing after 35s
Details 
Development 指向 oms.nanafa.com；Production 指向 ideship.com。微信 /wechat/mp/{appId} 仅匹配 wx 前缀。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-09 12:38:12 +08:00
zzh
7c1be3a723 fix: 将微信 OAuth 公开配置改为 /wechat/oauth/config
All checks were successful
Build and Deploy / deploy (push) Successful in 1m42s
Details 
避免被 /wechat/mp/{appId} 吞掉导致方法/参数校验异常。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-09 12:19:31 +08:00
zzh
937f0bb78b feat: 新增微信 OAuth 公开配置接口
All checks were successful
Build and Deploy / deploy (push) Successful in 1m51s
Details 
从其他配置 wechat_mp 返回 AppId 与 OAuthRedirectBase，供 H5 网页授权使用。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-09 09:17:50 +08:00
xiaolipro
ef12db52a0 更新 .gitea/workflows/deploy.yml
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
触发构建
 2026-09-07 16:16:15 +08:00
xiaolipro
7700baf127 feat：迁移到gitea
All checks were successful
Build and Deploy / deploy (push) Successful in 56s
Details
2026-09-05 16:34:35 +08:00
xiaolipro
93bef462fb feat: 迁移到gitea 2026-09-05 16:33:28 +08:00
xiaolipro
4fcc0bf7a9 Merge remote-tracking branch 'origin/master' 2026-09-05 16:30:27 +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
zzh
78e06d01b9 feat: 工作台扩展代发/拣货统计与业务趋势接口 
补充 Fulfill/Pickup 工作台统计 DTO 与查询实现，并扩展订单工作台聚合输出。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-28 10:59:10 +08:00
zzh
ce1349572d feat: extend receivable-payable APIs with summary, export, and filters 
Add summary/export endpoints plus customer code, effective stage, time field, and payment status filtering for finance reconciliation.
 2026-08-21 18:21:33 +08:00
zzh
2018e45a7d feat: 代发进度统计、申报HS分列与异常事件表迁移脚本 
补充代发进度 Tab 计数、PrimarySkuCodes 与 Im/Ex HS 编码输出；新增 t_order_exception_event 幂等迁移（Handler*、ConcurrencyStamp）并同步 db.sql。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-20 17:06:16 +08:00
zzh
9d813a5f89 feat: 代发订单 FulfillmentType 与进度筛选、绑定拣货后端 
支持 direct/warehouse 分轨、代发进度与库位排序、国内单号检索及到仓关联订单；扩展 SKU/店铺代发与库存绑定扣减能力。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-20 10:27:37 +08:00
zzh
654a65aba4 feat: workplace claimed stats and receiver address parse improvements 
Add claimed count to workplace stats; refine receiver address parse DTOs/helpers and AI skill seed wiring.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-09 19:06:49 +08:00
zzh
7e442180cd fix: avoid SqlSugar invalid SQL from null/HasValue KB filters 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-04 16:53:09 +08:00