jacy/dukang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
652 Commits 4 Branches 24 Tags
4c9b3f72bcd49e69d2641592059cc3b39f097e30
Commit Graph

652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jacy 4c9b3f72bc merge(dev_jacy): store bill issue date to today 2026-08-28 14:13:28 +08:00
jacy 3b669f7e38 fix(settlement): 门店 T+1 出账日改为窗口中的今天 
HQ 门店账单列名改为出账日；billDate 记今日（昨日 00:00–今日 00:00 右端），启动时把旧数据从核销自然日对齐过来。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-28 14:12:35 +08:00
jacy a7f3283ae5 merge(dev_jacy): v3.5.18 HQ 明文手机、任务版本与核销快链 2026-08-28 13:58:37 +08:00
jacy da19c39965 feat(admin): v3.5.18 用户详情明文手机、任务关联版本与核销快链 
HQ 后台：用户/核销记录展示完整手机号；任务列表与编辑可关联版本；账单核销单号与券号/用户可快链；门店账单日标明为出账自然日；技术支持操作按钮右对齐。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-28 13:58:08 +08:00
jacy faa1830bde merge(dev_jacy): HQ 订单筛选改版与用户商品模糊搜索 2026-08-28 13:11:17 +08:00
jacy b226af2adc feat(admin): 订单页筛选改版并支持用户与商品模糊搜索 
收起次要筛选项，去掉过滤测试；列表可按用户编号/昵称/备注/手机与商品名称/规格查询。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-28 13:10:36 +08:00
jacy 71149044ca merge(dev_jacy): HQ 推广码订单只计已完成并补快链 2026-08-28 12:56:02 +08:00
jacy fccfd7abbe feat(promo): HQ 推广码订单只计已完成并补扫码订单快链 
列表与详情的订单数/转化率按 COMPLETED 实时统计；扫码、订单、事件 ID 可跳到对应页。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-28 12:55:19 +08:00
jacy cfd42dfc32 merge(dev_jacy): 企微结算账单明细与成交播报用户明文 2026-08-27 11:45:59 +08:00
jacy 737efb89a3 feat(wecom): 结算账单明细与成交播报用户明文 
支付/核销补 HQ 备注且手机号不脱敏；结算通知按城市、合伙人、笔数和累计金额分块推送。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-27 11:45:08 +08:00
jacy 4111e5c0a6 merge(dev_jacy): v3.5.14 提交订单/支付成功日志端修复 2026-08-26 17:25:15 +08:00
jacy 3dbb73e428 fix(trade): v3.5.14 提交订单/支付成功日志使用真实 clientApp 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-26 17:24:56 +08:00
jacy e2f5aa9dd8 merge(dev_jacy): v3.5.12 大屏BGM、中文展示、分类删除与侧栏 2026-08-26 10:55:14 +08:00
jacy 58a8b47532 feat(admin): v3.5.12 大屏BGM、中文展示、分类删除修复与侧栏顺序 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-26 10:54:19 +08:00
jacy 448b9983d3 Merge pull request 'Dev jacy v3.5.11 企业微信通知调整' (#52) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/52
 2026-08-26 09:56:36 +08:00
jacy 3afbdfe6b9 v3.5.11企业微信通知调整
CI / verify (pull_request) Has been cancelled
Details
2026-08-26 09:55:19 +08:00
jacy 632539e8dc 增加现场提货的配置 2026-08-26 09:22:29 +08:00
jacy c7cd0f6cf2 C端SKU数量小于等于1不展示chip 
后端修复规格轴数据错乱显示问题
 2026-08-26 07:43:26 +08:00
jacy 1f06530894 Merge pull request '小程序版本号' (#50) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/50
 2026-08-26 07:15:52 +08:00
jacy 1f4506f60b 小程序版本号
CI / verify (pull_request) Has been cancelled
Details
2026-08-26 07:13:54 +08:00
jacy a2976cdc8f merge(dev_jacy): 同城运费路由与配送单信息 2026-08-25 21:12:53 +08:00
jacy cc0c0a6ef8 feat(fulfillment): 同城运费与路由修复，配送单展示商品用户地址 
同城 MANUAL/ZZXFX 按小飞侠价规计费，路由查询回退仓配凭证；HQ 配送单补商品、用户和收货地址。门店核销回跳与小程序核销码一并带上。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-25 21:12:36 +08:00
jacy ee1a3f4b6c merge(dev_jacy): 补承运商删除操作常量 2026-08-25 14:32:27 +08:00
jacy 52a7d3789d fix(ops): 补承运商删除操作常量以便生产构建 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-25 14:32:08 +08:00
jacy 98d52ff173 merge(dev_jacy): v3.5.10 同城配送提示与企微客服 2026-08-25 14:30:10 +08:00
jacy 797b20979d feat(mini-user): v3.5.10 同城配送提示可配置并支持换行 
承运商 HTML 按收货市下发；textarea 回车在 C 端转成换行。含门店去掉分享按钮与小程序企微客服。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-25 14:29:48 +08:00
jacy b1511ecb92 merge(dev_jacy): 列设置靠右与订单状态多选 2026-08-25 14:20:13 +08:00
jacy fed8ff3d3a fix(admin): 列设置靠右并支持订单状态多选 
HQ 列表主操作居右、列设置贴最右侧；订单筛选状态可多选，导出同步过滤。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-25 14:19:49 +08:00
jacy 30f8d649cb Merge pull request 'v3.5.9版本迭代列表优化' (#48) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/48
 2026-08-25 12:39:30 +08:00
jacy f4da71e952 v3.5.9版本迭代列表优化
CI / verify (pull_request) Has been cancelled
Details
2026-08-25 12:38:21 +08:00
jacy d7241d54b1 Merge pull request '给用户增加“备注”列' (#46) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/46
 2026-08-25 10:10:07 +08:00
jacy 282da24bc4 给用户增加“备注”列
CI / verify (pull_request) Has been cancelled
Details
2026-08-25 10:09:05 +08:00
jacy 5e0691ab35 Merge pull request 'Dev jacy v3.5.8 和 v3.5.9 版本更新' (#44) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/44
 2026-08-25 09:22:48 +08:00
jacy 5935024ea8 v3.5.8和v3.5.9版本更新
CI / verify (pull_request) Has been cancelled
Details
2026-08-25 09:20:32 +08:00
jacy 7304c7a8e1 chore(ops): 增加生产库备份/回滚与按 isTest 清理脚本 
只入库通用运维能力，不提交写死手机号的一次性清理脚本与 dump。

Co-authored-by: Cursor <cursoragent@cursor.com>
清除测试数据-数据库 		2026-08-23 22:03:35 +08:00
jacy b90a4e9f8f Merge pull request 'v3.5.7版本迭代' (#42) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/42
 2026-08-23 19:27:14 +08:00
jacy a3f17cbf94 v3.5.7版本迭代
CI / verify (pull_request) Has been cancelled
Details 
门店端UI修改
 2026-08-23 19:26:12 +08:00
jacy 6973e3d7f5 Merge pull request '修改订单导出时间错误' (#40) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/40
 2026-08-23 17:34:21 +08:00
jacy 114d77ca48 修改订单导出时间错误
CI / verify (pull_request) Has been cancelled
Details
2026-08-23 17:33:20 +08:00
jacy a144a35c3d Merge pull request 'Dev jacy v3.5.6 版本迭代' (#38) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/38
 2026-08-23 16:43:07 +08:00
jacy 7e12eb3ca6 v3.5.6版本迭代
CI / verify (pull_request) Has been cancelled
Details
2026-08-23 16:41:22 +08:00
jacy 608e3e5ec5 整理发布脚本 2026-08-23 14:37:36 +08:00
jacy d98b0aefb0 整理上下文 2026-08-23 14:37:29 +08:00
jacy 012626f6bd Merge pull request 'v3.5.5版本上传' (#36) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/36
 2026-08-23 12:29:33 +08:00
jacy 22cd00da42 v3.5.5版本上传
CI / verify (pull_request) Has been cancelled
Details
v3.5.5 		2026-08-23 12:26:57 +08:00
jacy 3004a65b35 Merge branches 'dev_jacy' and 'dev' of git.yqidian.com:jacy/dukang into dev 2026-08-21 23:52:37 +08:00
jacy f9161368e1 feat(admin): show HQ product list as SPU with expandable SKUs 
Group catalog rows by product, add paid bottle sales, and keep multi-SKU fulfillment on SKU rows only.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-21 23:52:28 +08:00
jacy 8a061f085f 提交v3.5.4 版本号小程序 v3.5.4 2026-08-21 17:49:53 +08:00
jacy b20e566a65 logo3 2026-08-21 17:39:11 +08:00
jacy 7d2e4ef57e merge(dev_jacy): v3.5.4 规格主图与门店使用规则 2026-08-21 17:37:09 +08:00