Dev Main by v3.4 测试数据删除 #10

Merged

jacy merged 91 commits from dev into main

2026-07-28 17:19:22 +08:00

Author	SHA1	Message	Date
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	37038a7591	fix(api): surface LLM network errors for WeCom AI replies CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-28 12:59:49 +08:00
jacy	944306e45c	fix(admin,partner): replace Tencent iframe picker with server LBS search CI / verify (pull_request) Has been cancelled Details Avoid locpicker formatted_addresses crash; proxy suggest/nearby/reverse via /common/lbs. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-28 12:56:50 +08:00
jacy	9ed0c24d11	fix(admin,partner): harden Tencent locpicker coords and confirm flow CI / verify (pull_request) Has been cancelled Details Accept latlng-only postMessage, confirm before apply, and read LBS key per request. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-28 00:47:08 +08:00
jacy	50349dd8e9	fix(mini-user): center qualification image on translucent mask CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-28 00:41:13 +08:00
jacy	e2fd28a35b	fix(partner): drop store-create SMS verify; keep qualification aspect ratio CI / verify (pull_request) Has been cancelled Details Partner H5 no longer requires store phone SMS on create; qualification overlay uses height auto with widthFix. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-28 00:34:31 +08:00
jacy	15c35c49de	分享功能和资质文件展示	2026-07-28 00:31:31 +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	aa9d689c76	fix(partner): guard null region on proxy order preview CI / verify (pull_request) Has been cancelled Details Avoid crash when province/city is not selected yet. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-28 00:10:47 +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	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	18ab639669	fix(store): use line comment for benefitUsageRule in Prisma schema CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-27 23:25:45 +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	ea8152ebf3	fix(deploy): use scp -P for sync-api-env port option CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-27 23:20:43 +08:00
jacy	78973e3fbf	fix(api): seed empty system settings from env including Tencent LBS key CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-27 23:19:54 +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	1725b9e4b4	小程序加上公司资质 CI / verify (pull_request) Has been cancelled Details	2026-07-26 13:31:21 +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	b810cabc6d	fix(partner): restore clearAllStoreDrafts export CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-26 10:18:06 +08:00
jacy	25aee745cc	fix(partner): export normalizeStringArray for store detail CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-26 10:17:24 +08:00
jacy	097c7dec4b	fix(shop): resolve duplicate open binding on home page CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-26 10:17:03 +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	94d2a88581	chore(settlement): add finance bills mock seed script CI / verify (pull_request) Has been cancelled Details EOF Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-26 10:08:01 +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	745c192693	知识库 CI / verify (pull_request) Has been cancelled Details	2026-07-26 08:37:11 +08:00
jacy	34532dc9bf	微信企业机器人创建	2026-07-26 08:16:56 +08:00
jacy	f053908acb	企业知识库搭建 CI / verify (pull_request) Has been cancelled Details	2026-07-26 07:45:08 +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	2a208d5dea	小程序端界面修改 CI / verify (pull_request) Has been cancelled Details	2026-07-23 15:23:23 +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	6479365d6a	小程序页面优化 CI / verify (pull_request) Has been cancelled Details	2026-07-23 14:03:22 +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	cd6b82abd8	小程序端核销权益输入框限制 CI / verify (pull_request) Has been cancelled Details	2026-07-23 00:32:09 +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	0418370c31	小程序端核销权益券金额输入限制 CI / verify (pull_request) Has been cancelled Details 现场取货功能	2026-07-23 00:03:21 +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	f2303f7fb8	核销金额：最低 0.01 元；输入最多两位小数；低于该值会 toast 提示，无法生成核销码。底部提示：左右留白 + 内边距，浅底圆角块，文案改为最低 0.01、余额上限、3 分钟到店出示。新增地址：进入页会尝试定位，自动选中当前省市区（失败则保留默认郑州）；编辑地址不重定位。	2026-07-22 23:11:34 +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
jacy	85f2c156b0	fix(admin): prevent false partner commission cap errors CI / verify (pull_request) Has been cancelled Details 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	addfcfb0b1	小程序页面优化（门店）	2026-07-22 17:56:25 +08:00
jacy	b392c28787	feat(settlement): redesign factory/partner/store statement bills CI / verify (pull_request) Has been cancelled Details 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	b534a569f8	小程序页面优化 CI / verify (pull_request) Has been cancelled Details	2026-07-22 15:12:19 +08:00
jacy	b0f565103f	用户端修改：付款按钮，显示单价，订单的图片	2026-07-22 13:02:52 +08:00
jacy	5e33dd9847	开店第三页银行卡号：只允许数字，最多 19 位；校验仍为 16–19 位。门店详情 / 开店页：去掉顶栏返回与标题空白，内容上顶，顶部约 12px，与「门店管理」一致。开店第一页底部：在「下一步」左侧加了「返回」（回门店列表）；第 2、3 步仍是「上一步」。	2026-07-22 12:44:12 +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	823e439101	开门营业成功后提示「开店成功」关闭门店改为自定义确认框，不再用 window.confirm，不会再带出页面域名	2026-07-22 11:50:05 +08:00
jacy	6c299f1a1d	管理端门店详情（审核抽屉）加上「审核材料」区	2026-07-22 11:45:36 +08:00
jacy	7c9827875f	合伙人端开店的流程里加入开店营业时间，放在开店流程的第一页。	2026-07-22 11:30:25 +08:00
jacy	ae7c63c08d	feat(h5): add pull-to-refresh on user partner and shop pages CI / verify (pull_request) Has been cancelled Details Share PullToRefresh for partner/shop H5; enable Taro pull-down on mini-user lists. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-22 11:19:42 +08:00
jacy	270cebc79a	fix(partner): move store-open phone verify to step 3 CI / verify (pull_request) Has been cancelled Details Confirm phone and SMS after bank details, then submit directly. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-22 10:22:53 +08:00
jacy	ba21cc89c6	Merge commit '56dfffd12647e1128ac4360aa9a4044361f0f7ab' into dev_jacy CI / verify (pull_request) Has been cancelled Details	2026-07-22 09:05:51 +08:00
ljy	56dfffd126	fix:增加小程序客服	2026-07-21 22:24:53 +08:00
jacy	bdf80e577b	fix(mini-user): address review blockers CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 13:03:02 +08:00
jacy	eb96b36d0b	feat(redeem): streamline phone redemption confirmation CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 11:41:06 +08:00
jacy	36bec94639	fix(h5): temporarily disable WeChat camera flows CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 11:18:51 +08:00
jacy	c11c7647b9	fix(h5): serve assets from dedicated domain roots CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 10:51:23 +08:00
jacy	83ed90ef67	feat(h5-auth): remember SMS sessions and simplify media access CI / verify (pull_request) Has been cancelled Details Hide WeChat login for shop and partner users, keep verified sessions for seven days, and allow JSSDK camera or album access without an OpenID binding. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 10:41:17 +08:00
jacy	73dbf6effb	chore(deploy): stop tracking auto-release.env; feat(mini-user): avatar profile sheet CI / verify (pull_request) Has been cancelled Details Remove secrets file from the index (keep local). Mine page can choose avatar and nickname via WeChat components. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 10:31:07 +08:00
jacy	b8adfe98a3	ignore	2026-07-21 10:19:09 +08:00
jacy	6c6fb10490	fix(deploy): correct APP_ROOT to /opt/dukang CI / verify (pull_request) Has been cancelled Details Server path is /opt/dukang; stale /opt/dukang-haoke broke PM2 cwd for mini-user H5. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 10:10:35 +08:00
jacy	935ab0d1d4	微信小程序审核不通过修改 CI / verify (pull_request) Has been cancelled Details	2026-07-21 09:32:06 +08:00
jacy	350a086a73	微信小程序端登录和头像调整	2026-07-21 08:59:44 +08:00
jacy	c5f526d51d	我的页面中的头像	2026-07-21 08:10:52 +08:00
jacy	e1f5130c18	页面顶部空白调整	2026-07-21 08:07:07 +08:00
jacy	bc0b0cafd6	微信小程序支付遇到问题，因为没有 WX_MCH_PRIVATE_KEY	2026-07-21 07:59:57 +08:00
jacy	ade68972a9	微信小程序端修改config服务器地址配置	2026-07-21 07:35:39 +08:00
jacy	47b39e3ba0	迁移的一些脚本文件	2026-07-21 00:01:50 +08:00
jacy	cf73bbae23	迁移的一些脚本文件	2026-07-21 00:01:45 +08:00
jacy	d1b207422c	fix(api): add TICKET_COLLAB to EventType enum CI / verify (pull_request) Has been cancelled Details Unblock nest build for after-sale ticket collaboration events. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-20 21:41:44 +08:00
jacy	4a29d8297c	Merge commit '792b543ba88acda4186bd823461ef1bb76d12f5b' into dev_jacy CI / verify (pull_request) Has been cancelled Details	2026-07-20 21:37:55 +08:00
ljy	792b543ba8	fix;提交、	2026-07-19 22:16:55 +08:00

Dev Main by v3.4 测试数据删除 #10

91 Commits