jacy
82c447b193
工单和发票
...
酒厂银行账户
2026-07-23 14:51:20 +08:00
jacy
75765bf9d4
后端修改权限和折叠功能
CI / verify (pull_request) Has been cancelled
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
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
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
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
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
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
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
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
jacy
85f2c156b0
fix(admin): prevent false partner commission cap errors
...
CI / verify (pull_request) Has been cancelled
Coerce city maxPartnerCommissionRate to Number so Decimal JSON strings do not break sum checks.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-22 18:03:32 +08:00
jacy
b392c28787
feat(settlement): redesign factory/partner/store statement bills
...
CI / verify (pull_request) Has been cancelled
Add WineryBill/StoreBill tables, partner review-send-confirm flow, daily/monthly cron, and admin multi-select confirm with status filters.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-22 17:25:49 +08:00
jacy
9a550cbaaf
feat(store): add two-level store categories for admin and partner open-store
...
CI / verify (pull_request) Has been cancelled
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
6c299f1a1d
管理端门店详情（审核抽屉）加上「审核材料」区
2026-07-22 11:45:36 +08:00
ljy
792b543ba8
fix;提交、
2026-07-19 22:16:55 +08:00
jacy
c2914c37e5
fix(partner): grant store staff open/close and media permissions by default
...
CI / verify (pull_request) Has been cancelled
Default new sub-accounts to store:create+store:manage, backfill empty permissions on /partner/me, and treat legacy store staff as allowed to mutate.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-17 10:43:15 +08:00
jacy
e9537ce052
后端仓库配送逻辑完善
CI / verify (pull_request) Has been cancelled
2026-07-17 08:57:19 +08:00
jacy
c204fb0a92
仓库自动配送开关
CI / verify (pull_request) Has been cancelled
2026-07-17 08:50:18 +08:00
jacy
c643b0b979
webadmin端订单修改
2026-07-17 08:45:33 +08:00
jacy
b36f2ea63a
城市合伙人H5端结算审核
2026-07-17 07:56:43 +08:00
jacy
bde85a7b82
仓库管理配置 小飞侠配置
CI / verify (pull_request) Has been cancelled
2026-07-16 21:40:25 +08:00
jacy
f6d97b4ee8
feat(trade): 仓配可调配履约与三分支推单
...
CI / verify (pull_request) Has been cancelled
同城有仓按仓库绑定承运商自动推单或自管填单，无仓/跨城走总部快递；新增仓配注册表、FulfillmentService 及三端运单追踪。
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-16 17:51:20 +08:00
jacy
5fe1ff1fc3
mock短信页面回显
CI / verify (pull_request) Has been cancelled
2026-07-15 20:03:06 +08:00
jacy
e0f5977dd9
门店审核功能
2026-07-14 15:25:17 +08:00
jacy
d61a43cc8c
webadmin增加财务模块
2026-07-14 15:16:41 +08:00
jacy
1bd152073a
webadmin系统设置
2026-07-12 22:52:40 +08:00
jacy
b5235dedef
后端增加发放好客权益券的接口
2026-07-12 20:28:43 +08:00
jacy
b550ee2255
OSS日志模块删掉
2026-07-12 17:46:39 +08:00
jacy
9fc955d81f
webadmin增加oss日志
2026-07-12 15:44:17 +08:00
jacy
d271ac5b13
webadmin端增加版本号和部署功能
2026-07-12 13:52:22 +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
54a15d6da7
门店账户多账号
2026-07-12 12:24:34 +08:00
jacy
06b1cb22e0
弱网核销功能
2026-07-12 12:00:55 +08:00
jacy
de01d36cdb
代下单功能
2026-07-12 11:40:04 +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
5fef6ae2b1
后端webadmin调整显示布局
2026-07-07 17:43:01 +08:00
jacy
2c74f6a08c
合伙人端登录接口优化
2026-07-07 15:22:55 +08:00
jacy
2e61caa49c
合伙人端登录验证调整还有日志落地
2026-07-07 14:34:02 +08:00
jacy
6572799264
webadmin端增加商铺日志
2026-07-07 12:12:12 +08:00
jacy
1fcafac2a7
后端显示门店账单
2026-07-07 00:04:07 +08:00
jacy
ljy