jacy/dukang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
435 Commits 4 Branches 13 Tags
b626db5d84ccc058060348b7c50f7fa6d12fe834
Commit Graph

58 Commits

Author SHA1 Message Date
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 71f508e02b feat: multi-module iteration 2026-08-04 21:38:49 +08:00
jacy 9d96c73246 feat: 技术支持工单/企微权限/开发版本管理/消息推送等迭代 2026-08-04 21:32:13 +08:00
jacy dc30932012 feat(redeem): 核销记录标记扫码/手机号并支持方式统计 
落库 RedeemChannel，门店记录页增加统计按钮，HQ 可按方式筛选。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-03 16:21:38 +08:00
jacy 26472f8678 fix(settlement): 全部门店可未出账提现并企微提醒 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-03 15:43:24 +08:00
jacy f3353bbce5 feat(settlement): 门店未出账手动提现与总部审核（OPT-010） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-03 15:32:01 +08:00
jacy fa3484041e feat(store): 门店可见白名单（对齐商品） 
HQ 可配置 visibilityWhitelistEnabled + 手机号；C 端公开门店列表/详情按登录手机号过滤；登录态变化后小程序重新拉门店列表。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-03 13:58:35 +08:00
jacy 87c4af7364 客服电话 → 13203801799（CUSTOMER_SERVICE_PHONE，协议文案走常量自动同步） 
权益页去掉分享按钮，菜单分享保留
支付成功改 reLaunch 清栈；订单列表返回首页
减数量低于起购时 toast「同城/跨城/现场提货至少购买 N 瓶」
核销成功可评星并 POST /redeem/ratings；HQ 新增「门店评价」页 /store-ratings
成功页「回到首页」改用 .redeem-cancel-btn，不再撑破布局
历史记录改为核销流水：GET /redeem/records；生产库已有 2 笔（用户 13073729990）可验证。权益明细字段映射也一并修了
我的页头像提高点击层级，避免被卡片遮挡
 2026-08-03 13:09:59 +08:00
jacy 847a3f0dc3 feat(catalog): add product fulfillment flags and auto SKU 
Enable online/cross-city/on-site purchase switches with trade gates, HQ and proxy UI, and server-generated DK SKUs.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-02 18:10:16 +08:00
jacy 09e732bfa3 微信JSSDK对接，代下单支付 2026-08-02 11:49:35 +08:00
jacy 50ba6e9c56 概览页增加表格统计 2026-08-02 11:16:51 +08:00
jacy 8d6c0f9ac0 feat(ops): partner proxy order list and HQ order delete
CI / verify (pull_request) Has been cancelled
Details 
Add partner-facing proxy order list/detail; unlock SUPER_ADMIN order delete with cascade cleanup and type filter.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-31 10:10:39 +08:00
jacy 51f2b5fbfa fix(trade): simplify proxy order and respect product whitelist 
Drop SMS verification for HQ/partner proxy orders; keep form draft across product picker; hide whitelist-only products from partner catalog.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-31 09:43:16 +08:00
jacy 2cd4e25682 feat(ops): add HQ admin proxy order and mini-user store session fixes 
Align HQ orders page with partner dual-SMS offline proxy flow; improve mini-user stores session and WeChat confirm-receive handling.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-31 09:18:19 +08:00
jacy ed7fd4e013 feat(catalog): product visibility whitelist by phone 
Admin can limit ON_SALE products to test phones; C-end filters by user phone.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 15:08:57 +08:00
jacy 0cb2b2cebb feat(admin): store detail edit with login phone sync; tighten HQ UI
CI / verify (pull_request) Has been cancelled
Details 
HQ store update now syncs store_account.phone for shop login; expand editable store fields. System version only for SUPER_ADMIN; permissions checklist layout polish.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 15:10:14 +08:00
jacy b920c894b9 feat(admin): city delete with impact preview; optional partner fields
CI / verify (pull_request) Has been cancelled
Details 
Allow deleting open cities after listing partners/stores; company name, address, and districts optional on partner create.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 13:33:12 +08:00
jacy fc03905777 feat(store): benefit coupon usage rules and show env photos on store detail
CI / verify (pull_request) Has been cancelled
Details 
Add benefitUsageRule on store create/edit (HQ + partner) and C-end detail between intro and env gallery.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 23:25:18 +08:00
jacy d36fe13bcd fix(admin,mini-user): store lat/lng edit with Baidu map, center pickup qty hint
CI / verify (pull_request) Has been cancelled
Details 
HQ store detail can set coordinates and open Baidu Map search by name/address; admin update API persists lat/lng.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 22:53:13 +08:00
jacy 09eda9a11e H5端开店增加获取当前店铺位置 2026-07-27 22:37:15 +08:00
jacy 92cf51ba3d feat(store): dual business hours, avg price, and status lock
CI / verify (pull_request) Has been cancelled
Details 
Support 1-2 hour segments and optional avgPrice; show bank settlement on HQ store detail; enforce pickup min 2 bottles; Chinese order statuses; block shop reopen after permanent close.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 10:16:22 +08:00
jacy da21cd3daa 系统判断配送限制 2026-07-26 09:59:38 +08:00
jacy 19cb312465 物流对账单 2026-07-26 09:51:33 +08:00
jacy ac1e0a9f13 feat(admin): require store category on HQ store create
CI / verify (pull_request) Has been cancelled
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 07:13:56 +08:00
jacy cebeefdb22 feat(trade): add on-site pickup order flow
CI / verify (pull_request) Has been cancelled
Details 
Product flag, ON_SITE_PICKUP delivery, mini confirm/receive pages; pay skips warehouse auto-advance.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-23 01:17:59 +08:00
jacy 9a550cbaaf feat(store): add two-level store categories for admin and partner open-store
CI / verify (pull_request) Has been cancelled
Details 
Admin CRUD under stores menu; partner picks leaf category on create.
Default sync only inserts missing rows and never updates existing ones.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 12:10:02 +08:00
jacy c643b0b979 webadmin端订单修改 2026-07-17 08:45:33 +08:00
jacy bde85a7b82 仓库管理配置 小飞侠配置
CI / verify (pull_request) Has been cancelled
Details
2026-07-16 21:40:25 +08:00
jacy f6d97b4ee8 feat(trade): 仓配可调配履约与三分支推单
CI / verify (pull_request) Has been cancelled
Details 
同城有仓按仓库绑定承运商自动推单或自管填单，无仓/跨城走总部快递；新增仓配注册表、FulfillmentService 及三端运单追踪。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-16 17:51:20 +08:00
jacy e0f5977dd9 门店审核功能 2026-07-14 15:25:17 +08:00
jacy b5235dedef 后端增加发放好客权益券的接口 2026-07-12 20:28:43 +08:00
jacy 9fc955d81f webadmin增加oss日志 2026-07-12 15:44:17 +08:00
jacy 63af3321dd feat(admin): HQ手机号编辑、合伙人子账号日志与子账号H5体验 
支持 HQ 账户改手机号（格式校验）、合伙人日志包含子账号且子账号不显示主账号信息；改手机号时清除微信绑定。合伙人 H5 子账号页签与我的页、录入门店底部按钮及上传失败提示。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-12 13:29:09 +08:00
jacy 06b1cb22e0 弱网核销功能 2026-07-12 12:00:55 +08:00
jacy d949301bc1 手机号核销确认 2026-07-12 10:34:58 +08:00
jacy 7f031cc4c2 城市合伙人端的修改（后台） 2026-07-12 10:19:39 +08:00
jacy 47f540fbd9 fix(h5-partner): resolve merge conflicts for auth and sub-accounts 
Merge partner session model (AuthGate, ensureSession, WeChat OAuth in Context) with sub-account routing, admin partner-account tree CRUD, upload lock, and partner staff flows.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 11:24:48 +08:00
jacy 2368121972 webadmin增加显示子账号显示列表 
修复api服务端报错
 2026-07-10 10:36:01 +08:00
ljy b32e2a06eb fix;提交代码子账号 2026-07-09 23:52:00 +08:00
jacy 1ac72e9a69 管理后台左侧列表调整 2026-07-07 18:49:47 +08:00
jacy 98e9652865 web端增加微信绑定管理 2026-07-07 18:25:15 +08:00
jacy 887d728496 webadmin去掉新建门店的短信验证 2026-07-07 18:17:45 +08:00
jacy 2c74f6a08c 合伙人端登录接口优化 2026-07-07 15:22:55 +08:00
jacy 2e61caa49c 合伙人端登录验证调整还有日志落地 2026-07-07 14:34:02 +08:00
jacy d9e72ab227 Merge commit 'fcf1d45522e3ba6e6faf2590b60f2db1ef90e73c' into dev_jacy 2026-07-07 13:55:10 +08:00
jacy 6572799264 webadmin端增加商铺日志 2026-07-07 12:12:12 +08:00
jacy 7ca9fc8a35 门店账号管理修改 2026-07-07 00:01:16 +08:00
jacy 4c38a9dd2b 增加核销接口 
增加hq管理端日志
 2026-07-06 19:17:27 +08:00
jacy f0b99ea9da webadmin端 
批量删除用户
模板上传图片数量限制改成30
小飞侠接口配置
 2026-07-06 18:04:02 +08:00
jacy 4e18763968 小飞侠接口调通测试 2026-07-06 17:07:35 +08:00