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

269 Commits

Author SHA1 Message Date
jacy da19c39965 feat(admin): v3.5.18 用户详情明文手机、任务关联版本与核销快链 
HQ 后台：用户/核销记录展示完整手机号；任务列表与编辑可关联版本；账单核销单号与券号/用户可快链；门店账单日标明为出账自然日；技术支持操作按钮右对齐。

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

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-28 13:10:36 +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 737efb89a3 feat(wecom): 结算账单明细与成交播报用户明文 
支付/核销补 HQ 备注且手机号不脱敏；结算通知按城市、合伙人、笔数和累计金额分块推送。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-27 11:45:08 +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 58a8b47532 feat(admin): v3.5.12 大屏BGM、中文展示、分类删除修复与侧栏顺序 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-26 10:54:19 +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 cc0c0a6ef8 feat(fulfillment): 同城运费与路由修复，配送单展示商品用户地址 
同城 MANUAL/ZZXFX 按小飞侠价规计费，路由查询回退仓配凭证；HQ 配送单补商品、用户和收货地址。门店核销回跳与小程序核销码一并带上。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-25 21:12:36 +08:00
jacy 52a7d3789d fix(ops): 补承运商删除操作常量以便生产构建 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-25 14:32:08 +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 fed8ff3d3a fix(admin): 列设置靠右并支持订单状态多选 
HQ 列表主操作居右、列设置贴最右侧；订单筛选状态可多选，导出同步过滤。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-25 14:19:49 +08:00
jacy f4da71e952 v3.5.9版本迭代列表优化
CI / verify (pull_request) Has been cancelled
Details
2026-08-25 12:38:21 +08:00
jacy 282da24bc4 给用户增加“备注”列
CI / verify (pull_request) Has been cancelled
Details
2026-08-25 10:09:05 +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 114d77ca48 修改订单导出时间错误
CI / verify (pull_request) Has been cancelled
Details
2026-08-23 17:33:20 +08:00
jacy 7e12eb3ca6 v3.5.6版本迭代
CI / verify (pull_request) Has been cancelled
Details
2026-08-23 16:41:22 +08:00
jacy 22cd00da42 v3.5.5版本上传
CI / verify (pull_request) Has been cancelled
Details
2026-08-23 12:26:57 +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 4d434c9c67 v3.5.4 规格主图、门店使用规则与收银台 logo 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-21 17:36:53 +08:00
jacy 62e61a9e63 v3.5.4版本提交，修改api
CI / verify (pull_request) Has been cancelled
Details
2026-08-21 16:22:53 +08:00
jacy a01217539c v3.5.4版本提交
CI / verify (pull_request) Has been cancelled
Details
2026-08-21 15:48:15 +08:00
jacy 26334ed072 v3.5.3版本更新2
CI / verify (pull_request) Has been cancelled
Details
2026-08-20 20:09:05 +08:00
jacy fc2e5b65de v3.5.3版本更新1
CI / verify (pull_request) Has been cancelled
Details
2026-08-20 18:54:15 +08:00
jacy 8b5bb6a981 大屏显示优化
CI / verify (pull_request) Has been cancelled
Details
2026-08-20 13:41:50 +08:00
jacy 6cf66c722c v3.5.2 大屏调整
CI / verify (pull_request) Has been cancelled
Details
2026-08-20 11:58:15 +08:00
jacy 4db21cf1a1 mockpay功能调试
CI / verify (pull_request) Has been cancelled
Details
2026-08-20 00:51:18 +08:00
jacy 233ed0af3b v3.5.1 版本更新
CI / verify (pull_request) Has been cancelled
Details
2026-08-19 15:54:51 +08:00
jacy 48d6900ab6 fix(iam): 合伙人登录双拦截——子账号status=DISABLED 与 主账号bindingStatus=PAUSED 均拒绝登录
CI / verify (push) Has been cancelled
Details
2026-08-17 23:39:53 +08:00
jacy cc750dc1d6 feat: v3.4.18 门店体验与登录态优化 
- mini-user 门店座机电话中间四位脱敏（保留区号与前后位）
- mini-user 套餐详情图增加 1/N 计数与自动轮播
- h5-partner 账号暂停(DISABLED)禁止登录并提示客服
- h5-shop 提现/筛选栏左右留白与页面一致
- h5-shop 休息中核销改为弹「是否开启营业」并支持开张后继续

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>
 2026-08-17 21:34:40 +08:00
jacy 1c91e6bae9 v3.4.17 门店套餐审核快捷入口
CI / verify (push) Has been cancelled
Details
2026-08-16 11:57:01 +08:00
jacy 0f48d7abda feat(admin,store): landline contact phone and package audit UX 
Allow store contactPhone as landline, show pending package audit badge, and split live vs pending packages in HQ review.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-14 18:45:10 +08:00
jacy 88053353ab feat(ops,store,partner): 用户权益列 + 门店合同多图上传 
- admin 用户列表新增剩余/已用/累计好客权益金额三列（benefitCoupon groupBy 聚合，排除 VOID）
- admin/partner 门店入驻合同支持多张照片与 PDF（CommonResource 多记录，复用 ENV 多图逻辑）
- 新增 contract-urls.util 归一化工具，向后兼容旧 contractUrl 字段并标记 deprecated

需求1/2/3
 2026-08-12 22:48:02 +08:00
jacy 478291e2b3 fix(admin): contract preview, package audit detail, empty packages, winery status 
Allow HQ to save stores with zero packages, preview contract images/PDFs, inspect package audit images/content, and show gray 无需打款 when winery payable is 0.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-10 20:30:55 +08:00
jacy 46361ec713 feat(v3.4.16): partner UX, package pricing, CS gate, HQ list polish 
Stop auto ST from validation_error; show package prices with right-aligned layout; partner store list status/filter and onboard CS QR gate; HQ store table truncation/fixed actions; expose CS config in wechat_mini settings; bind local servers for LAN.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-09 16:00:45 +08:00
jacy 07630c9046 feat(store): separate login phone from public contactPhone 
Store.phone stays login/boss; contactPhone is C-end dial. Public store APIs keep phone compat via publicDial mapping.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-09 07:50:40 +08:00
jacy 8f83624ffe chore(dev): move local API default port to 3010 
Avoid conflict with another local service on 3000; align Vite proxies and docs.
 2026-08-07 21:03:23 +08:00
jacy 21d44026d9 fix(store): persist package imageUrls on audit approve 
Ensure multi-image packages are written on approval and always returned as arrays from store detail.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-07 20:46:26 +08:00
jacy 34a1897c09 feat(store): add store sortOrder and swipeable package gallery 
Enable HQ-controlled store list ordering and horizontal multi-image browsing on package detail.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-07 19:58:38 +08:00
jacy 76375eff83 feat(v3.4.15): HQ store media edit and package images up to 20 
Allow HQ to replace/delete store photos; support multi-image packages with a 20-image cap.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-07 19:24:07 +08:00
jacy 0692bebf07 fix(courier): parse XFX multipart/form-data track callbacks 
Xiaofeixia posts multipart form fields; previously mis-read as urlencoded empty payload. Parse multipart text parts and map into order status transitions.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-07 19:08:03 +08:00
jacy 8726cf14e3 fix(courier): cast IncomingMessage when skipping XFX body parsers 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-07 18:58:45 +08:00
jacy 155426b669 fix(courier): log XFX track callback rawBody and Content-Type 
Capture raw request for courier track callbacks regardless of Content-Type and persist contentType/rawBody/query into log_third_party for empty-body diagnosis.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-07 18:57:31 +08:00
jacy b626db5d84 feat(ops): add global test whitelist and exclude test accounts from settlement 
Unify product/store visibility on HQ whitelist, mark isTest snapshots, and fix SUPER_ADMIN access for the new module.
 2026-08-07 15:46:23 +08:00
jacy 10fa361983 feat(v3.4.15): admin delivery track drawer and mini-user store list polish 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-07 13:25:55 +08:00
jacy e4e9eb2169 fix(h5-shop): harden iOS WeChat scan after login with hard nav and recover UI 
Root cause is JSSDK entry-URL mismatch after SPA post-OAuth, not camera permission. Hard-navigate on iOS, keep OAuth query in sign URL, skip redundant bind OAuth, and prompt refresh/re-auth on failure.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-07 13:08:13 +08:00
jacy 571959900b fix(courier): parse XFX form-urlencoded track callbacks and raw ACK 
Enable urlencoded body parser, return XFX {code,message} without API envelope, and harden callback payload parsing.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-06 17:51:00 +08:00
jacy 83b1b0e5f6 feat(mini-user): configurable WeChat mini share scenes in system settings 
Add HQ group for default and per-page share title/desc/image; expose via client-config and wire all mini-user share entry points.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-06 15:45:57 +08:00