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

107 Commits

Author SHA1 Message Date
jacy e93e4b8f84 feat: audit diff, mock SMS 999888, env photos, proxy pay lock, mini-user UX 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-03 20:47:28 +08:00
jacy 3c19b7dd97 feat(store): 门店套餐 v3.4.10 全端实现 
新增 StorePackage 与变更审核流，覆盖总部直存、合伙/门店提审、C 端展示与套餐异议工单；同步 PRD/开发文档与 REQ 索引。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-03 19:30:59 +08:00
jacy dc30932012 feat(redeem): 核销记录标记扫码/手机号并支持方式统计 
落库 RedeemChannel，门店记录页增加统计按钮，HQ 可按方式筛选。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-03 16:21:38 +08:00
jacy 54fca99208 feat(settlement): 统一门店账单列表合并 T+1 与手动提现 
总部财务以门店账单为唯一入口；新增 store-settlements API，去掉独立提现审菜单并更新企微引导文案。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-03 16:04:45 +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 3328c52cb4 feat(ops): WeCom webhook alerts for pay/redeem anomalies 
Add outbound group-bot alerts, rate/amount rules, stuck-order cron, HQ test button, and health db/redis checks.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-02 16:01:30 +08:00
jacy 45d3d8164d fix(admin-web): show company-name in store create partner dropdown 2026-08-02 13:07:09 +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 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 1a0afb6d39 feat(trade): WeChat confirm-receive component + admin status log columns 
Open weappOrderConfirm in mini-user so users confirm in-app instead of
service notice; verify via get_order before completing. Show operator/remark
on admin order status timeline.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 16:48:44 +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 309b180087 feat(admin): link city-partner store count; fix benefitUsageRule null string
CI / verify (pull_request) Has been cancelled
Details 
City partner storeCount jumps to /stores?partnerId=; normalize empty/null text so usage rule is not saved as literal "null.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 16:03:56 +08:00
jacy 118d57d710 feat(admin): delete store staff; city store count links to filtered list
CI / verify (pull_request) Has been cancelled
Details 
HQ can remove store sub-accounts from primary account detail; cities table store count jumps to /stores?cityId=.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 15:43:09 +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 daeb24bbeb feat(admin): gate user/order/city delete behind assignable HQ permissions
CI / verify (pull_request) Has been cancelled
Details 
Add users_delete, orders_delete, cities_delete; default HQ (incl. super admin) has none until explicitly granted.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 14:01:18 +08:00
jacy f4766d32ff fix(admin): make partner company/address/district optional on create UI
CI / verify (pull_request) Has been cancelled
Details 
Remove required asterisks on CityPartnersPage create form (main entry).

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 13:44:19 +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 cd23119470 feat(mini-user): enable share on home/benefit and OSS qualification
CI / verify (pull_request) Has been cancelled
Details 
Wire WeChat share on home and benefit tabs; serve mine qualification
from OSS; mask phones on admin users and wechat bindings pages.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 23:41:29 +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 317f910f3c feat(admin,partner): Tencent map location picker and expose LBS key 
Store create/edit on HQ and partner can pick coords via Tencent locpicker; client-config exposes TENCENT_LBS_KEY; seed empty system settings from env.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 23:19:40 +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 15b878f2a4 fix(admin,mini-user): product on-sale tag, store coords inputs, home UX
CI / verify (pull_request) Has been cancelled
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 22:40:57 +08:00
jacy 09eda9a11e H5端开店增加获取当前店铺位置 2026-07-27 22:37:15 +08:00
jacy 23c0cc7a5f 小程序优化，商铺定位等 2026-07-27 22:33:00 +08:00
jacy cc9933d1ce feat(admin): require business hours when creating stores
CI / verify (pull_request) Has been cancelled
Details 
HQ create-store wizard now collects 1-2 hour segments and avgPrice, and API validates them on create/update.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 10:19:58 +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 2b7ef65cce feat(admin): LLM config, knowledge base, and WeCom AI binding
CI / verify (pull_request) Has been cancelled
Details 
Add owner-scoped model API settings, uploadable knowledge bases, and WeCom bot AI/KB wiring with OpenAI-compatible URL normalization.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 09:31:22 +08:00
jacy 34532dc9bf 微信企业机器人创建 2026-07-26 08:16:56 +08:00
jacy 959e0b66cb 技术支持工单
CI / verify (pull_request) Has been cancelled
Details
2026-07-26 07:31:49 +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 82c447b193 工单和发票 
酒厂银行账户
 2026-07-23 14:51:20 +08:00
jacy 75765bf9d4 后端修改权限和折叠功能
CI / verify (pull_request) Has been cancelled
Details
2026-07-23 14:38:52 +08:00
jacy d11757c854 fix(admin): improve promo layout and system settings save UX
CI / verify (pull_request) Has been cancelled
Details 
Fix mini home media form persistence; float save with unsaved leave prompt; promo detail QR on the right.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-23 13:54:10 +08:00
jacy 479de04f7c feat(mini-user): add configurable home banner and footer
CI / verify (pull_request) Has been cancelled
Details 
HQ system settings WeChat mini config with OSS swiper/footer uploads; client-config exposes miniHome.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-23 12:15:15 +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 e93e4a7721 推广码后端页面优化 2026-07-23 00:43:49 +08:00
jacy 047ffd7b16 chore(admin): label promo QR as mini-program code
CI / verify (pull_request) Has been cancelled
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-23 00:21:55 +08:00
jacy bca1d8afea feat(promo): generate WeChat mini-program codes on create 
Use getwxacodeunlimit with activity id as scene, upload PNG to OSS qrcode/, and show in HQ admin.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-23 00:21:10 +08:00
jacy cd206d6baa feat(ops): show redeem records on benefit coupon detail
CI / verify (pull_request) Has been cancelled
Details 
Reuse the same coupon redeem trace as order detail (primary/secondary, allocations).

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 23:52:48 +08:00
jacy aeb72154a7 开城合伙人页与城市详情内合伙人 Tab 已同步 2026-07-22 23:43:16 +08:00
jacy e0d3c840a2 feat(ops): show order redeem records including FIFO secondary coupons
CI / verify (pull_request) Has been cancelled
Details 
Persist redeem allocations and surface them on HQ order detail with backfill for history.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 23:38:51 +08:00
jacy fb530e2ff5 城市合伙人县区不做限制 2026-07-22 23:06:51 +08:00
jacy 8c4419e04e fix(admin): city-scoped district pick and clearer overlap errors
CI / verify (pull_request) Has been cancelled
Details 
Region partners only select districts under the chosen city; overlap errors name the occupying partner.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 18:14:54 +08:00