Commit Graph

764 Commits

Author SHA1 Message Date
46d2eff3aa 优惠券 返回shopId 2024-11-08 16:49:01 +08:00
b2e228b83a 字段问题 2024-11-08 14:23:42 +08:00
7c2b6cb25f 商品券 2024-11-08 13:36:12 +08:00
19202f5881 邀请记录 2024-11-08 11:42:12 +08:00
ac09705e8c 分享好友 进入页面 领取优惠券 2024-11-07 18:27:10 +08:00
6a54e8f23a 分享好友1 2024-11-07 15:25:37 +08:00
6f94f63697 分享好友 2024-11-07 15:07:40 +08:00
张松
7f34a7fcfa fix: 餐位费校验修改 2024-11-07 11:23:00 +08:00
张松
7d86bc5c28 fix: 切换就餐模式返回的价格不包含客座费 2024-11-07 09:47:46 +08:00
张松
e92e0c3c62 fix: 未设置会员价与商品价保持一致 2024-11-06 17:01:47 +08:00
张松
437e0c4ced fix: 会员价修改 2024-11-06 15:51:12 +08:00
张松
d9d789f493 fix: 会员价修改 2024-11-06 15:48:15 +08:00
张松
72b6780339 fix: 会员价修改 2024-11-06 15:45:36 +08:00
张松
d1ca5179f9 fix: 会员价修改 2024-11-06 14:43:35 +08:00
张松
4c4f249ff4 fix: 支付修改 2024-11-06 14:33:18 +08:00
张松
84356ca245 fix: 创建订单修复 2024-11-06 14:26:37 +08:00
张松
bc21f638e6 feat: 会员价相关 2024-11-06 13:58:54 +08:00
张松
e5e0e2a825 feat: 会员价相关 2024-11-06 13:50:54 +08:00
张松
7b86cbfcb6 feat: 购物车及订单增加会员价 2024-11-06 10:11:25 +08:00
张松
7bbc7de1f8 feat: 购物车及订单增加会员价 2024-11-06 10:01:09 +08:00
张松
5285a0875f feat: 购物车及订单增加会员价 2024-11-06 09:49:34 +08:00
5ebdb1610c feat: 店铺信息返回霸王餐相关配置 2024-11-05 17:15:39 +08:00
d4149c091b Merge remote-tracking branch 'origin/test' into test 2024-11-05 16:31:33 +08:00
7b793bb9f2 feat: 充值支持支付宝充值 2024-11-05 16:31:23 +08:00
Tankaikai
b2ced9cd10 Merge remote-tracking branch 'origin/test' into test 2024-11-05 15:40:24 +08:00
谭凯凯
438f4c333e 积分模块相关代码 2024-11-05 15:40:18 +08:00
306f34a30e feat: 霸王餐充值修改 2024-11-05 15:24:29 +08:00
7e05e91642 feat: 霸王餐充值修改 2024-11-05 15:24:00 +08:00
dfef9c90c8 feat: 霸王餐充值修改 2024-11-05 15:22:26 +08:00
90ea8b5122 Merge remote-tracking branch 'origin/test' into test 2024-11-05 15:17:42 +08:00
018480994e feat: 霸王餐充值修改 2024-11-05 15:17:14 +08:00
Tankaikai
89eee3f9c4 Merge remote-tracking branch 'origin/test' into test 2024-11-05 15:13:28 +08:00
谭凯凯
f54231c073 积分模块相关代码 2024-11-05 15:13:21 +08:00
12a802fe49 feat: 霸王餐充值修改 2024-11-05 15:00:11 +08:00
917d53e2bb Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbMemberPointsServiceImpl.java
2024-11-05 11:27:50 +08:00
22e3230cf4 feat: 优惠券积分支付相关 2024-11-05 11:26:13 +08:00
谭凯凯
a7569f99ba 积分模块相关代码 2024-11-04 16:32:00 +08:00
谭凯凯
af5c1e2e4a 积分模块相关代码 2024-11-01 18:22:11 +08:00
谭凯凯
1dc7a2a5de 积分模块相关代码 2024-11-01 18:10:29 +08:00
谭凯凯
4c14f6a908 积分模块相关代码 2024-11-01 17:45:13 +08:00
谭凯凯
b81cef6782 积分模块相关代码 2024-11-01 17:39:33 +08:00
谭凯凯
f8f47a2457 积分模块相关代码 2024-11-01 17:37:30 +08:00
谭凯凯
0b86ed1459 积分模块相关代码 2024-11-01 17:25:40 +08:00
谭凯凯
02a756d32d 积分模块相关代码 2024-11-01 16:51:11 +08:00
谭凯凯
41edba65fc 积分模块相关代码 2024-11-01 16:31:44 +08:00
GYJ
a9bfd9b93b Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
2024-11-01 10:18:53 +08:00
GYJ
67471fa3b2 Merge branch 'refs/heads/gyj' into test
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
2024-11-01 10:14:14 +08:00
GYJ
9c82661351 商品会员价 2024-11-01 10:12:13 +08:00
GYJ
6792450f6b Merge branch 'refs/heads/dev' into gyj 2024-11-01 10:00:25 +08:00
谭凯凯
4301cbb891 积分模块相关代码 2024-10-31 16:52:11 +08:00