张松
|
930ca57ddf
|
新客立减
|
2025-09-25 17:55:32 +08:00 |
|
张松
|
818751740d
|
新客立减
|
2025-09-25 17:50:38 +08:00 |
|
张松
|
dfb19c9ae6
|
新客立减
|
2025-09-25 17:44:31 +08:00 |
|
张松
|
d0e230a1b8
|
新客立减
|
2025-09-25 17:43:32 +08:00 |
|
张松
|
aafe9937a8
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-25 17:40:35 +08:00 |
|
张松
|
bb7ef94706
|
代码生成方法
|
2025-09-25 17:40:28 +08:00 |
 wangw
|
d4a8aa2685
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-25 17:24:17 +08:00 |
|
wangw
|
cef8f16ac8
|
新客立减校验新用户
|
2025-09-25 17:24:06 +08:00 |
|
张松
|
2ce3deea3c
|
会员修改
|
2025-09-25 17:23:18 +08:00 |
|
wangw
|
764edfe8df
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-25 17:16:03 +08:00 |
|
wangw
|
5c41fb8d67
|
优惠券弹窗
|
2025-09-25 17:15:58 +08:00 |
|
张松
|
0d5cb268b0
|
充值改造
|
2025-09-25 15:33:13 +08:00 |
|
张松
|
35e2f9abe5
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-25 14:41:16 +08:00 |
|
张松
|
0acab5ce5c
|
充值改造
|
2025-09-25 14:41:09 +08:00 |
|
wangw
|
1e39877bb0
|
优惠券店铺列表
|
2025-09-25 14:37:40 +08:00 |
|
张松
|
b5e6077321
|
充值改造
|
2025-09-25 14:35:48 +08:00 |
|
张松
|
c9c5e37783
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-25 14:32:28 +08:00 |
|
张松
|
657eef3b8a
|
充值改造
|
2025-09-25 14:32:17 +08:00 |
|
wangw
|
f0fabd5d73
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-25 11:43:11 +08:00 |
|
wangw
|
76640b17a7
|
字段名称 问题
|
2025-09-25 11:42:54 +08:00 |
|
张松
|
6bcf58aafc
|
个人中心会员相关
|
2025-09-25 11:41:39 +08:00 |
|
张松
|
f4b6e68eff
|
个人中心会员相关
|
2025-09-25 11:28:51 +08:00 |
|
张松
|
d756d179ef
|
会员购买完善
|
2025-09-25 10:57:25 +08:00 |
|
wangw
|
d3018a1536
|
优惠券 门槛金额校验问题
|
2025-09-25 10:29:37 +08:00 |
|
wangw
|
2aa5064d5f
|
优惠券 最大折扣金额
|
2025-09-25 09:39:26 +08:00 |
|
wangw
|
97f920b6c7
|
优惠券 补充
|
2025-09-25 09:15:59 +08:00 |
|
wangw
|
bf35cd843f
|
shopId
|
2025-09-24 18:03:02 +08:00 |
|
wangw
|
630899f901
|
用户优惠券列表4
|
2025-09-24 17:22:03 +08:00 |
|
wangw
|
5cd753cc1c
|
用户优惠券列表3
|
2025-09-24 17:14:08 +08:00 |
|
wangw
|
55f488db7f
|
用户优惠券列表
|
2025-09-24 15:16:51 +08:00 |
|
wangw
|
46b86ca505
|
循环依赖
|
2025-09-24 11:31:02 +08:00 |
|
wangw
|
8630a62c6d
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-24 11:07:36 +08:00 |
|
wangw
|
a31bdc2396
|
报错修改
|
2025-09-24 11:05:51 +08:00 |
|
张松
|
62b117865e
|
会员赠券流程完善
|
2025-09-24 11:02:13 +08:00 |
|
wangw
|
307ebac8fa
|
引入包名称
|
2025-09-23 16:51:21 +08:00 |
|
张松
|
887746e9d3
|
会员购买
|
2025-09-23 16:17:41 +08:00 |
|
张松
|
9f9b292919
|
会员调整
|
2025-09-23 14:38:03 +08:00 |
|
wangw
|
fc2757ff17
|
会员 mainShopId
|
2025-09-23 13:43:27 +08:00 |
|
wangw
|
eb31057b3e
|
可抵扣数量
|
2025-09-19 11:09:52 +08:00 |
|
wangw
|
2673440426
|
优惠券 填充 券
|
2025-09-18 18:11:23 +08:00 |
|
wangw
|
ce2af8c5be
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-18 16:55:34 +08:00 |
|
wangw
|
95d2c0d809
|
新客立减
|
2025-09-18 16:55:24 +08:00 |
|
张松
|
dcb68f5717
|
新客立减调整
|
2025-09-18 16:54:27 +08:00 |
|
张松
|
4d9773226e
|
新客立减获取减免金额方法
|
2025-09-18 16:50:44 +08:00 |
|
张松
|
8e95d7f68d
|
新客立减获取减免金额方法
|
2025-09-18 16:41:06 +08:00 |
|
张松
|
64b1841782
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-18 16:36:34 +08:00 |
|
张松
|
d9b314df18
|
新客立减获取减免金额方法
|
2025-09-18 16:36:27 +08:00 |
|
wangw
|
d23cb8b71b
|
参加消费赠券
新客立减 50%
|
2025-09-18 16:21:03 +08:00 |
|
张松
|
61f1a8de71
|
券发放修改
|
2025-09-18 16:13:47 +08:00 |
|
张松
|
2d9c1b4815
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-18 15:09:05 +08:00 |
|
张松
|
537aeb09a1
|
优惠券发放
|
2025-09-18 15:08:58 +08:00 |
|
wangw
|
84f0cb0a9b
|
校验 剩余数量
|
2025-09-18 15:06:05 +08:00 |
|
wangw
|
0db2362077
|
消费赠券 关联内容 先删除
|
2025-09-18 09:22:26 +08:00 |
|
张松
|
4710fc4e71
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-17 17:59:53 +08:00 |
|
张松
|
e44ceece68
|
新客立减修改
|
2025-09-17 17:59:46 +08:00 |
|
wangw
|
02fe159249
|
子店铺的 商品ID问题
|
2025-09-17 17:34:46 +08:00 |
|
张松
|
78f3c5e0bc
|
新客立减修改
|
2025-09-17 17:28:30 +08:00 |
|
wangw
|
84acedfff6
|
修改为单店时 移除子店铺的券
|
2025-09-17 15:54:16 +08:00 |
|
wangw
|
af6f23c6ca
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-17 15:48:31 +08:00 |
|
wangw
|
25c606c856
|
修改为单店时 删除子店铺的 券
|
2025-09-17 15:48:22 +08:00 |
|
张松
|
f32aa4c7a0
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-17 15:43:27 +08:00 |
|
张松
|
c04eceb097
|
智慧充值字段统一
|
2025-09-17 15:43:21 +08:00 |
|
wangw
|
949eb9b158
|
优惠券对应商品的部分 子店铺使用子店铺的
|
2025-09-17 13:46:31 +08:00 |
|
张松
|
db3027a2ed
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-17 11:32:28 +08:00 |
|
张松
|
31e11323c6
|
前端随机立减金额获取
|
2025-09-17 11:32:21 +08:00 |
|
wangw
|
08d87469ff
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-17 11:22:24 +08:00 |
|
wangw
|
66369da7f1
|
新特性
|
2025-09-17 11:22:16 +08:00 |
|
张松
|
a0c5903aa6
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-17 11:21:35 +08:00 |
|
张松
|
42fbc8ba65
|
前端随机立减金额获取
|
2025-09-17 11:21:22 +08:00 |
|
wangw
|
74e3b6526b
|
pom
|
2025-09-17 11:17:56 +08:00 |
|
wangw
|
a962372583
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-17 11:16:22 +08:00 |
|
wangw
|
8e345b5737
|
预览模式问题
|
2025-09-17 11:15:42 +08:00 |
|
张松
|
ddf3bf7697
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
|
2025-09-17 11:12:17 +08:00 |
|
张松
|
154401fafb
|
前端随机立减金额获取
|
2025-09-17 11:11:52 +08:00 |
|
wangw
|
3e81ea93b6
|
循环依赖问题
|
2025-09-17 11:09:52 +08:00 |
|
wangw
|
de08266971
|
订单 优惠券部分 重写
|
2025-09-17 10:54:47 +08:00 |
|
张松
|
b4fb2afd68
|
新客立减修改
|
2025-09-17 10:26:29 +08:00 |
|
张松
|
d620ccf564
|
忽略代码生成main文件
|
2025-09-16 14:35:06 +08:00 |
|
张松
|
caeee47520
|
充值记录
|
2025-09-16 14:34:45 +08:00 |
|
张松
|
696ffc49ae
|
超级会员相关
|
2025-09-16 14:05:30 +08:00 |
|
wangw
|
ec1e94fdaf
|
MkShopCouponRecordService.receiveCoupon 发放券 统一方法
|
2025-09-16 11:07:32 +08:00 |
|
wangw
|
d006a2dce3
|
日期校验
|
2025-09-13 16:14:22 +08:00 |
|
wangw
|
5ef41403e0
|
领取时间 范围校验
|
2025-09-13 16:09:02 +08:00 |
|
wangw
|
dca94cc848
|
原记录表作废
|
2025-09-13 15:57:51 +08:00 |
|
wangw
|
77ac277856
|
领取
|
2025-09-13 15:35:20 +08:00 |
|
wangw
|
db50c78049
|
消费赠券 跳转 id 选中
|
2025-09-13 11:18:26 +08:00 |
|
wangw
|
c110695843
|
关联关系 type
|
2025-09-13 09:59:58 +08:00 |
|
wangw
|
02e5684c0f
|
取消关联
|
2025-09-13 09:30:41 +08:00 |
|
wangw
|
0794ac7569
|
新增字段 已发放数量 giftNum
已发放数量 问题
|
2025-09-12 17:56:11 +08:00 |
|
wangw
|
cedcec2cac
|
消费赠券 没有title
|
2025-09-12 17:18:58 +08:00 |
|
wangw
|
7d405f9455
|
shopId填充
|
2025-09-12 17:15:15 +08:00 |
|
wangw
|
1b111262ad
|
优惠券新增 Id回填
|
2025-09-12 15:38:32 +08:00 |
|
wangw
|
f2007bb881
|
循环依赖
|
2025-09-12 15:15:18 +08:00 |
|
wangw
|
3b53b460fd
|
消费赠券 优惠券
|
2025-09-12 15:10:43 +08:00 |
|
张松
|
2e69148249
|
超级会员相关
|
2025-09-12 15:07:30 +08:00 |
|
wangw
|
f703028fa1
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-12 14:14:59 +08:00 |
|
wangw
|
d01f66d6a4
|
赠送券活动 关联表
|
2025-09-12 14:14:51 +08:00 |
|
张松
|
10817c01a0
|
超级会员购买相关
|
2025-09-12 13:46:40 +08:00 |
|
张松
|
6bf8ee2c0b
|
超级会员购买相关
|
2025-09-12 11:46:49 +08:00 |
|
张松
|
ccb76143cc
|
超级会员购买相关
|
2025-09-12 11:13:35 +08:00 |