Commit Graph

7 Commits

Author SHA1 Message Date
zzh
d38963055b feat: 支付用券/会员折扣写入负数应收行,订单应收与实付一致
- 支付成功后写入 coupon_discount / member_discount 负数应收(币种、阶段跟随运费行,记录券码/会员等级)
- 营销重算的折前应收排除抵扣行,避免重复扣减;规则公式忽略抵扣行
- 预报/入库计费任务跳过已付款订单,防止重复投递冲掉应收
- 手工新增费用禁止抵扣费用项;费用输出给出抵扣行显示名
- 订单详情返回折前小计、会员折扣、优惠券抵扣、客户实付
- 新增 fee_item 字典迁移 migrate_fee_item_marketing_discount_20261019.sql
2026-10-19 15:48:15 +08:00
zzh
223d32f62a feat: 订单支付时选券,新增支付预览接口并按所选券扣款核销
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
- 新增 GET /order/pay-preview:返回会员折/券互斥后的应付拆解与本单可选券
- POST /order/pay 支持 couponInstanceId(null 沿用已绑定券,0 不用券,>0 指定券),按试算应付扣款并核销券、释放被替换券的锁定
- 被当前订单锁定的券视为可用,修复入库/编辑重算营销金额时误报券被占用

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-19 14:01:00 +08:00
zzh
c3d21dfdbb fix: 裂变邀请人发券,并合并营销 SQL 到 admin1008
All checks were successful
Build and Deploy / deploy (push) Successful in 1m5s
补齐被邀请人首单派送成功后给邀请人发放 REFERRAL_INVITER;将分散 migrate 脚本合并为可重复执行的 admin1008.sql。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-08 17:30:22 +08:00
zzh
f972a28d79 feat: 落地滚动会员、券发放与邀请分成奖励
All checks were successful
Build and Deploy / deploy (push) Successful in 3m50s
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-06 17:40:24 +08:00
zzh
5003cacd79 fix: repair marketing compile errors and harden deploy CI
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-27 10:51:13 +08:00
zzh
c5fb4c7e58 feat: add employee profile, IDE employee nos, and marketing invite/coupon fixes
Introduce t_employee linked to RBAC users, switch employee numbers to IDE001+, and keep invite bind/newcomer coupon backend changes. Drop retired sql/migrate and seed scripts in favor of db.sql.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-26 23:18:57 +08:00
zzh
89233bc3da feat: add customer marketing module (M1-M6 backend)
Implement referral, points, coupons, commission, member levels, and order integration with migration SQL and background jobs.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-23 16:42:08 +08:00