Commit Graph

40 Commits

Author SHA1 Message Date
jacy d36fe13bcd fix(admin,mini-user): store lat/lng edit with Baidu map, center pickup qty hint
CI / verify (pull_request) Has been cancelled
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
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
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
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
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
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 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
jacy f46904b47c 商品模板功能上传 2026-07-06 15:29:27 +08:00
jacy 80d967f2cf 小飞侠接口 2026-07-06 14:12:06 +08:00
jacy 1c978b8adc 短信验证调试成功 2026-07-06 13:18:56 +08:00
ljy 569becedaa feat;提交管理端和城市合伙人端 2026-07-05 23:48:20 +08:00
jacy 4b2589156c oss接通了80端口,还没有接通https,先用 2026-07-02 16:13:45 +08:00
jacy 8a67d72de4 admin web 修改订单状态 2026-07-01 22:00:10 +08:00
jacy aeb4ecfc84 v3数据表更改 2026-07-01 14:36:50 +08:00
jacy 25f0d8e97b hqweb端 2026-07-01 08:27:26 +08:00