张松
|
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 |
|
谭凯凯
|
8b11aeb935
|
积分模块相关代码
|
2024-10-31 15:24:03 +08:00 |
|
谭凯凯
|
55249d0965
|
积分模块相关代码
|
2024-10-31 14:47:13 +08:00 |
|
谭凯凯
|
db32655a82
|
积分模块相关代码
|
2024-10-31 14:03:33 +08:00 |
|
谭凯凯
|
2953f97858
|
积分模块相关代码
|
2024-10-31 13:53:47 +08:00 |
|
谭凯凯
|
976d29158c
|
积分模块相关代码
|
2024-10-31 10:39:09 +08:00 |
|
谭凯凯
|
2d82ec84d6
|
积分模块相关代码
|
2024-10-31 10:27:47 +08:00 |
|
谭凯凯
|
1e9d7c84c3
|
积分模块相关代码
|
2024-10-31 09:32:40 +08:00 |
|
谭凯凯
|
9ed592dad9
|
增加密码为空提示
|
2024-10-30 16:09:02 +08:00 |
|
Tankaikai
|
9e70c63407
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-30 15:57:36 +08:00 |
|
谭凯凯
|
0bab0696ef
|
编译错误修正
|
2024-10-30 15:57:30 +08:00 |
|
|
|
368bb18b6d
|
fix: 霸王餐支付回调修改 增加霸王餐记录
|
2024-10-30 14:42:05 +08:00 |
|
|
|
a5d1b4342f
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-30 14:38:15 +08:00 |
|
|
|
e9885f76cb
|
fix: 霸王餐支付回调修改 增加霸王餐记录
|
2024-10-30 14:37:29 +08:00 |
|
谭凯凯
|
07f7d905fe
|
支付宝支付缺陷修复
|
2024-10-30 10:17:10 +08:00 |
|