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

Merged

jacy merged 91 commits from dev into main 2026-07-28 17:19:22 +08:00

Conversation 0 Commits 91 Files Changed 307

+26271 -4719

jacy commented 2026-07-28 17:19:14 +08:00

Owner

Copy Link

Copy Source

清楚测试数据，使用正式数据上线。

清楚测试数据，使用正式数据上线。

jacy added 91 commits 2026-07-28 17:19:14 +08:00

fix;提交、 792b543ba8

Merge commit '792b543ba88acda4186bd823461ef1bb76d12f5b' into dev_jacy 4a29d8297c

fix(api): add TICKET_COLLAB to EventType enum ... d1b207422c

Unblock nest build for after-sale ticket collaboration events.

Co-authored-by: Cursor <cursoragent@cursor.com>

迁移的一些脚本文件 cf73bbae23

迁移的一些脚本文件 47b39e3ba0

微信小程序端修改config服务器地址配置 ade68972a9

微信小程序支付遇到问题，因为没有 WX_MCH_PRIVATE_KEY bc0b0cafd6

页面顶部空白调整 e1f5130c18

我的页面中的头像 c5f526d51d

微信小程序端登录和头像调整 350a086a73

微信小程序审核不通过修改 935ab0d1d4

fix(deploy): correct APP_ROOT to /opt/dukang ... 6c6fb10490

Server path is /opt/dukang; stale /opt/dukang-haoke broke PM2 cwd for mini-user H5.

Co-authored-by: Cursor <cursoragent@cursor.com>

ignore b8adfe98a3

chore(deploy): stop tracking auto-release.env; feat(mini-user): avatar profile sheet ... 73dbf6effb

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>

feat(h5-auth): remember SMS sessions and simplify media access ... 83ed90ef67

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>

fix(h5): serve assets from dedicated domain roots ... c11c7647b9

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(h5): temporarily disable WeChat camera flows ... 36bec94639

Co-authored-by: Cursor <cursoragent@cursor.com>

feat(redeem): streamline phone redemption confirmation ... eb96b36d0b

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(mini-user): address review blockers ... bdf80e577b

Co-authored-by: Cursor <cursoragent@cursor.com>

fix:增加小程序客服 56dfffd126

Merge commit '56dfffd12647e1128ac4360aa9a4044361f0f7ab' into dev_jacy ba21cc89c6

fix(partner): move store-open phone verify to step 3 ... 270cebc79a

Confirm phone and SMS after bank details, then submit directly.

Co-authored-by: Cursor <cursoragent@cursor.com>

feat(h5): add pull-to-refresh on user partner and shop pages ... ae7c63c08d

Share PullToRefresh for partner/shop H5; enable Taro pull-down on mini-user lists.

Co-authored-by: Cursor <cursoragent@cursor.com>

合伙人端开店的流程里加入开店营业时间，放在开店流程的第一页。 7c9827875f

管理端门店详情（审核抽屉）加上「审核材料」区 6c299f1a1d

开门营业成功后提示「开店成功」 ... 823e439101

关闭门店改为自定义确认框，不再用 window.confirm，不会再带出页面域名

feat(store): add two-level store categories for admin and partner open-store ... 9a550cbaaf

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>

开店第三页银行卡号：只允许数字，最多 19 位；校验仍为 16–19 位。 ... 5e33dd9847

门店详情 / 开店页：去掉顶栏返回与标题空白，内容上顶，顶部约 12px，与「门店管理」一致。
开店第一页底部：在「下一步」左侧加了「返回」（回门店列表）；第 2、3 步仍是「上一步」。

用户端修改：付款按钮，显示单价，订单的图片 b0f565103f

小程序页面优化 b534a569f8

feat(settlement): redesign factory/partner/store statement bills ... b392c28787

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>

小程序页面优化（门店） addfcfb0b1

fix(admin): prevent false partner commission cap errors ... 85f2c156b0

Coerce city maxPartnerCommissionRate to Number so Decimal JSON strings do not break sum checks.

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(admin): city-scoped district pick and clearer overlap errors ... 8c4419e04e

Region partners only select districts under the chosen city; overlap errors name the occupying partner.

Co-authored-by: Cursor <cursoragent@cursor.com>

城市合伙人县区不做限制 fb530e2ff5

核销金额：最低 0.01 元；输入最多两位小数；低于该值会 toast 提示，无法生成核销码。 ... f2303f7fb8

底部提示：左右留白 + 内边距，浅底圆角块，文案改为最低 0.01、余额上限、3 分钟到店出示。
新增地址：进入页会尝试定位，自动选中当前省市区（失败则保留默认郑州）；编辑地址不重定位。

feat(ops): show order redeem records including FIFO secondary coupons ... e0d3c840a2

Persist redeem allocations and surface them on HQ order detail with backfill for history.

Co-authored-by: Cursor <cursoragent@cursor.com>

开城合伙人页与城市详情内合伙人 Tab 已同步 aeb72154a7

feat(ops): show redeem records on benefit coupon detail ... cd206d6baa

Reuse the same coupon redeem trace as order detail (primary/secondary, allocations).

Co-authored-by: Cursor <cursoragent@cursor.com>

小程序端核销权益券金额输入限制 ... 0418370c31

现场取货功能

feat(promo): generate WeChat mini-program codes on create ... bca1d8afea

Use getwxacodeunlimit with activity id as scene, upload PNG to OSS qrcode/, and show in HQ admin.

Co-authored-by: Cursor <cursoragent@cursor.com>

chore(admin): label promo QR as mini-program code ... 047ffd7b16

Co-authored-by: Cursor <cursoragent@cursor.com>

小程序端核销权益输入框限制 cd6b82abd8

推广码后端页面优化 e93e4a7721

feat(trade): add on-site pickup order flow ... cebeefdb22

Product flag, ON_SITE_PICKUP delivery, mini confirm/receive pages; pay skips warehouse auto-advance.

Co-authored-by: Cursor <cursoragent@cursor.com>

feat(mini-user): add configurable home banner and footer ... 479de04f7c

HQ system settings WeChat mini config with OSS swiper/footer uploads; client-config exposes miniHome.

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(admin): improve promo layout and system settings save UX ... d11757c854

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>

小程序页面优化 6479365d6a

后端修改权限和折叠功能 75765bf9d4

工单和发票 ... 82c447b193

酒厂银行账户

小程序端界面修改 2a208d5dea

feat(admin): require store category on HQ store create ... ac1e0a9f13

Co-authored-by: Cursor <cursoragent@cursor.com>

技术支持工单 959e0b66cb

企业知识库搭建 f053908acb

微信企业机器人创建 34532dc9bf

知识库 745c192693

feat(admin): LLM config, knowledge base, and WeCom AI binding ... 2b7ef65cce

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>

物流对账单 19cb312465

系统判断配送限制 da21cd3daa

chore(settlement): add finance bills mock seed script ... 94d2a88581

EOF

Co-authored-by: Cursor <cursoragent@cursor.com>

feat(store): dual business hours, avg price, and status lock ... 92cf51ba3d

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>

fix(shop): resolve duplicate open binding on home page ... 097c7dec4b

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(partner): export normalizeStringArray for store detail ... 25aee745cc

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(partner): restore clearAllStoreDrafts export ... b810cabc6d

Co-authored-by: Cursor <cursoragent@cursor.com>

feat(admin): require business hours when creating stores ... cc9933d1ce

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>

小程序加上公司资质 1725b9e4b4

小程序优化，商铺定位等 23c0cc7a5f

H5端开店增加获取当前店铺位置 09eda9a11e

fix(admin,mini-user): product on-sale tag, store coords inputs, home UX ... 15b878f2a4

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(admin,mini-user): store lat/lng edit with Baidu map, center pickup qty hint ... d36fe13bcd

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>

feat(admin,partner): Tencent map location picker and expose LBS key ... 317f910f3c

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>

fix(api): seed empty system settings from env including Tencent LBS key ... 78973e3fbf

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(deploy): use scp -P for sync-api-env port option ... ea8152ebf3

Co-authored-by: Cursor <cursoragent@cursor.com>

feat(store): benefit coupon usage rules and show env photos on store detail ... fc03905777

Add benefitUsageRule on store create/edit (HQ + partner) and C-end detail between intro and env gallery.

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(store): use line comment for benefitUsageRule in Prisma schema ... 18ab639669

Co-authored-by: Cursor <cursoragent@cursor.com>

feat(mini-user): enable share on home/benefit and OSS qualification ... cd23119470

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>

feat(partner): complete proxy order with dual SMS and pickup ... b59d4484ec

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>

fix(partner): guard null region on proxy order preview ... aa9d689c76

Avoid crash when province/city is not selected yet.

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(partner): drop pickup store and reorder promo on proxy order ... a49d8d99b6

On-site pickup no longer requires a store; move optional promo above fulfillment mode.

Co-authored-by: Cursor <cursoragent@cursor.com>

分享功能和资质文件展示 15c35c49de

fix(partner): drop store-create SMS verify; keep qualification aspect ratio ... e2fd28a35b

Partner H5 no longer requires store phone SMS on create; qualification overlay uses height auto with widthFix.

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(mini-user): center qualification image on translucent mask ... 50349dd8e9

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(admin,partner): harden Tencent locpicker coords and confirm flow ... 9ed0c24d11

Accept latlng-only postMessage, confirm before apply, and read LBS key per request.

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(admin,partner): replace Tencent iframe picker with server LBS search ... 944306e45c

Avoid locpicker formatted_addresses crash; proxy suggest/nearby/reverse via /common/lbs.

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(api): surface LLM network errors for WeCom AI replies ... 37038a7591

Co-authored-by: Cursor <cursoragent@cursor.com>

feat(admin): city delete with impact preview; optional partner fields ... b920c894b9

Allow deleting open cities after listing partners/stores; company name, address, and districts optional on partner create.

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(admin): make partner company/address/district optional on create UI ... f4766d32ff

Remove required asterisks on CityPartnersPage create form (main entry).

Co-authored-by: Cursor <cursoragent@cursor.com>

feat(admin): gate user/order/city delete behind assignable HQ permissions ... daeb24bbeb

Add users_delete, orders_delete, cities_delete; default HQ (incl. super admin) has none until explicitly granted.

Co-authored-by: Cursor <cursoragent@cursor.com>

feat(admin): store detail edit with login phone sync; tighten HQ UI ... 0cb2b2cebb

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>

feat(admin): delete store staff; city store count links to filtered list ... 118d57d710

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>

feat(admin): link city-partner store count; fix benefitUsageRule null string ... 309b180087

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>

jacy merged commit 1bc3bec977 into main 2026-07-28 17:19:22 +08:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

ljy jacy

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: jacy/dukang#10