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

36 Commits

Author SHA1 Message Date
jacy 442f1ea842 该商品不支持跨城配送，请更换为开城城市内的收货地址 2026-08-02 21:41:50 +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 cb6ecaaba6 fix(trade): on-site pickup pay success marks order COMPLETED 2026-08-02 13:42:15 +08:00
jacy 09e732bfa3 微信JSSDK对接，代下单支付 2026-08-02 11:49:35 +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 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 bf9cd1bffd feat(trade): upload WeChat mini program shipping info 
Hook SHIPPING and on-site pickup to upload_shipping_info for settlement unlock.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 14:35:21 +08:00
jacy a49d8d99b6 fix(partner): drop pickup store and reorder promo on proxy order
CI / verify (pull_request) Has been cancelled
Details 
On-site pickup no longer requires a store; move optional promo above fulfillment mode.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 00:19:52 +08:00
jacy b59d4484ec feat(partner): complete proxy order with dual SMS and pickup
CI / verify (pull_request) Has been cancelled
Details 
Add partner/customer SMS confirm, address auto-receive or on-site
pickup, proxy placer fields, PARTNER_PROXY user source, and C-end badge.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 00:04:59 +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 82c447b193 工单和发票 
酒厂银行账户
 2026-07-23 14:51:20 +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 0418370c31 小程序端核销权益券金额输入限制
CI / verify (pull_request) Has been cancelled
Details 
现场取货功能
 2026-07-23 00:03:21 +08:00
ljy 792b543ba8 fix;提交、 2026-07-19 22:16:55 +08:00
jacy 00b52b9aaa 用户端跨城订单界面优化
CI / verify (pull_request) Has been cancelled
Details
2026-07-17 09:06:53 +08:00
jacy 608e405468 城市合伙人去掉订单补发功能，酒的订单如果没有配置仓库应该是看不到的
CI / verify (pull_request) Has been cancelled
Details
2026-07-17 08:04:53 +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 450dc44d0e 微信小程序支付功能打通 2026-07-13 00:07:17 +08:00
jacy de01d36cdb 代下单功能 2026-07-12 11:40:04 +08:00
jacy 7f031cc4c2 城市合伙人端的修改（后台） 2026-07-12 10:19:39 +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
ljy fcf1d45522 fix:完善门店和总部管理端 2026-07-06 20:58:38 +08:00
jacy 1c978b8adc 短信验证调试成功 2026-07-06 13:18:56 +08:00
jacy 5ba69eb935 发布商品，商品图片使用oss服务器地址 2026-07-06 08:53:03 +08:00
jacy f7fe4597c6 支付时检测是否已经微信授权 2026-07-02 17:34:58 +08:00
jacy ff4622ff6c 对接微信支付 2026-07-01 22:41:49 +08:00
jacy aea1513836 微信SDK接通 2026-07-01 19:56:44 +08:00
jacy aeb4ecfc84 v3数据表更改 2026-07-01 14:36:50 +08:00
jacy d3dd3a0ad1 用户端和服务端增加地址功能（三个地址共存） 2026-07-01 00:52:44 +08:00
jacy 1800e792b1 订单详情页内容调整（增加配送方式、订单号等） 2026-07-01 00:29:39 +08:00
jacy 6e047dc0a5 init 2026-06-30 10:33:56 +08:00