 SongZhang
|
cf4116e4b9
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-29 14:52:11 +08:00 |
|
SongZhang
|
bfca837e78
|
1.代客下单 查询购物车校验状态
|
2024-08-29 14:52:01 +08:00 |
牛叉闪闪
|
ad0c743ae4
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-29 14:46:31 +08:00 |
|
牛叉闪闪
|
445551f0d5
|
修改
|
2024-08-29 14:45:45 +08:00 |
|
SongZhang
|
c1df28b929
|
1.代客下单 台桌状态同时校验detail和购物车数据
|
2024-08-29 14:29:15 +08:00 |
|
SongZhang
|
1dba8819b9
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-29 14:25:03 +08:00 |
|
SongZhang
|
3829685b58
|
1.代客下单 台桌状态同时校验detail和购物车数据
|
2024-08-29 14:24:54 +08:00 |
|
牛叉闪闪
|
3a185c4d59
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-29 14:07:40 +08:00 |
|
牛叉闪闪
|
525c56f30c
|
修改
|
2024-08-29 14:04:04 +08:00 |
|
SongZhang
|
0bdbd07555
|
1.修改会员余额支付备注
|
2024-08-29 13:45:26 +08:00 |
|
牛叉闪闪
|
4ea005d132
|
修改打印小票
|
2024-08-29 10:30:11 +08:00 |
|
牛叉闪闪
|
6e5866e46e
|
修改打印小票
|
2024-08-29 10:24:15 +08:00 |
|
牛叉闪闪
|
3a7468af91
|
修改打印小票
|
2024-08-29 10:16:21 +08:00 |
|
牛叉闪闪
|
b18ab44412
|
修改打印小票
|
2024-08-29 10:14:20 +08:00 |
|
牛叉闪闪
|
1192f454aa
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-29 09:58:57 +08:00 |
|
牛叉闪闪
|
d94d89fe78
|
修改打印小票
|
2024-08-29 09:56:43 +08:00 |
|
SongZhang
|
95965f8a3c
|
1.打印折扣值为空报错修复
|
2024-08-29 09:46:02 +08:00 |
|
牛叉闪闪
|
7b0e91e4b4
|
添加会员充值退款
|
2024-08-29 09:44:45 +08:00 |
|
牛叉闪闪
|
f01391014a
|
添加会员变动与通知
|
2024-08-28 17:18:41 +08:00 |
|
牛叉闪闪
|
e49e72e088
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-28 16:51:44 +08:00 |
|
牛叉闪闪
|
9a70e49663
|
添加会员变动与通知
|
2024-08-28 16:51:00 +08:00 |
 wangw
|
ae3d77e8c3
|
PC 版本管理
|
2024-08-28 16:20:04 +08:00 |
|
wangw
|
15c09f9666
|
退单 扣除销量
|
2024-08-28 16:19:52 +08:00 |
|
牛叉闪闪
|
c82b340d30
|
添加会员变动与通知
|
2024-08-28 11:27:14 +08:00 |
|
牛叉闪闪
|
acf7e71769
|
添加会员变动与通知
|
2024-08-28 09:57:23 +08:00 |
|
SongZhang
|
6dcd8368a0
|
1.代客下单 结算单打印
|
2024-08-27 14:53:34 +08:00 |
|
SongZhang
|
fbe7b72e4b
|
1.代客下单 结算单打印
|
2024-08-27 11:41:52 +08:00 |
|
SongZhang
|
9942bc6de6
|
Merge remote-tracking branch 'origin/test' into dkxd2
|
2024-08-27 10:59:37 +08:00 |
|
SongZhang
|
838351f279
|
1.代客下单 结算单打印
|
2024-08-27 10:57:45 +08:00 |
|
SongZhang
|
d8bac55fb0
|
1.代客下单 结算单打印
|
2024-08-27 10:57:29 +08:00 |
|
牛叉闪闪
|
6e5216192d
|
修改支付逻辑
|
2024-08-27 10:48:37 +08:00 |
|
SongZhang
|
35e039a530
|
1.代客下单 已下单商品不支持删除
|
2024-08-27 10:36:05 +08:00 |
|
牛叉闪闪
|
2461e5d808
|
修改支付逻辑
|
2024-08-27 09:45:03 +08:00 |
|
SongZhang
|
6705689d34
|
Merge remote-tracking branch 'origin/test' into dkxd2
|
2024-08-27 09:12:11 +08:00 |
|
SongZhang
|
f585a4f46a
|
1.代客下单
|
2024-08-27 09:11:55 +08:00 |
|
牛叉闪闪
|
253e2f9c0b
|
修改支付逻辑
|
2024-08-27 09:11:14 +08:00 |
|
牛叉闪闪
|
a1d0fa1a7f
|
修改支付逻辑
|
2024-08-26 18:27:12 +08:00 |
|
牛叉闪闪
|
bc5bdf1421
|
修改支付逻辑
|
2024-08-26 18:22:52 +08:00 |
|
牛叉闪闪
|
cf2dfc295c
|
修改支付逻辑
|
2024-08-26 18:02:06 +08:00 |
|
牛叉闪闪
|
ddf9af76b5
|
修改支付逻辑
|
2024-08-26 17:31:27 +08:00 |
|
牛叉闪闪
|
0f74c30e58
|
修改支付逻辑
|
2024-08-26 17:00:38 +08:00 |
|
牛叉闪闪
|
651f2c1427
|
修改支付逻辑
|
2024-08-26 16:25:00 +08:00 |
|
牛叉闪闪
|
d3b3fe2492
|
修改支付逻辑
|
2024-08-26 15:49:19 +08:00 |
|
牛叉闪闪
|
ed5bb107d0
|
添加员工折扣
|
2024-08-26 15:42:21 +08:00 |
|
wangw
|
42e6b3a689
|
充值报错问题
|
2024-08-26 15:27:55 +08:00 |
|
SongZhang
|
6f93900c2a
|
1.代客下单 打印菜品小票,以及结算小票
|
2024-08-26 15:14:57 +08:00 |
|
牛叉闪闪
|
b0f62d3dad
|
添加员工折扣
|
2024-08-26 15:03:35 +08:00 |
|
牛叉闪闪
|
a7263f85e7
|
Merge remote-tracking branch 'origin/hph' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
|
2024-08-26 15:01:32 +08:00 |
|
牛叉闪闪
|
fdfeb5701a
|
添加员工折扣
|
2024-08-26 14:58:29 +08:00 |
|
SongZhang
|
6a6ce8ef1c
|
1.代客下单 打印菜品小票
|
2024-08-26 14:23:56 +08:00 |