 SongZhang
|
b2a7ea1887
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-30 14:41:05 +08:00 |
|
SongZhang
|
5a90bfe202
|
Merge branch 'refs/heads/dev' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
|
2024-10-30 14:40:54 +08:00 |
|
SongZhang
|
8bb27ab292
|
fix: 订单列表接口返回就餐类型字段
|
2024-10-30 14:18:01 +08:00 |
|
SongZhang
|
3f0329a7c5
|
fix: 无台桌退菜实现
|
2024-10-30 14:04:06 +08:00 |
|
SongZhang
|
6ec1e0ef7d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-29 17:19:07 +08:00 |
|
SongZhang
|
9d23c4d337
|
fix: 订单过期结束购物车状态
|
2024-10-29 17:18:58 +08:00 |
Tankaikai
|
3a00b85a02
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-10-29 16:06:48 +08:00 |
|
谭凯凯
|
d5b0813c46
|
会员余额支付缺陷修复
|
2024-10-29 15:47:09 +08:00 |
|
谭凯凯
|
17cbff4228
|
会员余额支付缺陷修复
|
2024-10-29 15:16:34 +08:00 |
|
Tankaikai
|
a11cb5eea5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-29 15:12:11 +08:00 |
|
SongZhang
|
d978abc2e1
|
Merge branch 'refs/heads/dev' into test
|
2024-10-29 15:11:00 +08:00 |
|
SongZhang
|
04fab9ef26
|
fix: 修稿储值卡支付保存的用户id和店铺会员id
|
2024-10-29 15:10:46 +08:00 |
|
SongZhang
|
ad8c87d313
|
fix: 退款金额不准确修复
|
2024-10-29 15:02:21 +08:00 |
|
SongZhang
|
b94760f6f5
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-10-29 15:01:49 +08:00 |
|
SongZhang
|
46be2c0f63
|
fix: 退款金额不准确修复
|
2024-10-29 14:54:52 +08:00 |
|
SongZhang
|
0afdccaa9e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-29 14:37:38 +08:00 |
|
SongZhang
|
e79e527bfd
|
Merge branch 'refs/heads/dev' into test
|
2024-10-29 14:37:22 +08:00 |
 yijiegong
|
ecfe7dc128
|
Merge branch 'gyj' into test
|
2024-10-29 14:12:24 +08:00 |
|
yijiegong
|
edceabad0e
|
Merge branch 'gyj' into dev
|
2024-10-29 14:11:35 +08:00 |
|
yijiegong
|
9f0bef5f52
|
TbUserInfoController 恢复
|
2024-10-29 14:11:17 +08:00 |
|
谭凯凯
|
264da3c5b3
|
积分模块相关接口
|
2024-10-29 09:56:41 +08:00 |
|
SongZhang
|
2ba232f149
|
chore: 正式端三方支付回调地址修改
|
2024-10-29 09:51:53 +08:00 |
|
SongZhang
|
365bb5cd5e
|
chore: 正式端增加三方支付回调地址配置
|
2024-10-29 09:39:31 +08:00 |
|
SongZhang
|
35ccf243f1
|
fix: 储值卡支付不能退款修复
|
2024-10-29 09:34:34 +08:00 |
|
SongZhang
|
fced36d732
|
fix: 无桌台删除菜品修复
|
2024-10-29 09:28:30 +08:00 |
|
SongZhang
|
3b9de3bd56
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-29 09:18:37 +08:00 |
|
SongZhang
|
46312d855c
|
Merge branch 'refs/heads/dev' into test
|
2024-10-29 09:18:16 +08:00 |
|
SongZhang
|
bc061518f5
|
fix: 退菜sql修复
|
2024-10-29 09:17:48 +08:00 |
|
谭凯凯
|
d54471ec3c
|
积分模块相关接口
|
2024-10-29 09:09:28 +08:00 |
|
SongZhang
|
267c24e16a
|
fix: 代客下单折扣为空导致详情金额有误修复
|
2024-10-28 16:50:07 +08:00 |
|
SongZhang
|
9988723044
|
fix: 无桌台代客下单修改
|
2024-10-28 14:19:24 +08:00 |
|
SongZhang
|
7a9d226783
|
fix: 无台桌购物车为空创建订单报错
|
2024-10-26 17:54:04 +08:00 |
|
谭凯凯
|
7748367695
|
Pad点餐后台配置接口
|
2024-10-26 17:34:48 +08:00 |
|
谭凯凯
|
8ef1894a47
|
Pad点餐后台配置接口
|
2024-10-26 17:29:20 +08:00 |
|
Tankaikai
|
0e05d067a0
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-10-26 17:27:52 +08:00 |
 wangw
|
9207ebfd03
|
Merge branch 'ww' into test
|
2024-10-26 17:05:07 +08:00 |
|
wangw
|
c7187fe1ab
|
优惠券 领取详情 以及 删除
|
2024-10-26 17:04:41 +08:00 |
|
SongZhang
|
3b2f2e4bbe
|
fix: 餐位费退菜修复
|
2024-10-26 16:20:42 +08:00 |
|
SongZhang
|
f75aae14a8
|
fix: 餐位费退菜修复
|
2024-10-26 16:14:12 +08:00 |
|
SongZhang
|
ce94bd7e4e
|
feat: 订单列表返回餐位费信息
|
2024-10-26 13:51:07 +08:00 |
|
SongZhang
|
763014f65a
|
feat: 订单列表返回餐位费信息
|
2024-10-26 13:35:04 +08:00 |
|
wangw
|
24387973dc
|
Merge branch 'ww' into test
|
2024-10-26 11:41:13 +08:00 |
|
wangw
|
25ded0b4f8
|
优惠券 类型筛选
|
2024-10-26 11:40:58 +08:00 |
|
wangw
|
d805b3d729
|
Merge branch 'ww' into test
|
2024-10-26 11:25:03 +08:00 |
|
wangw
|
065772c2c3
|
优惠券 删除
|
2024-10-26 11:23:50 +08:00 |
|
SongZhang
|
e19535d71e
|
feat: 订单详情返回是否打包赠送字段
|
2024-10-26 09:55:33 +08:00 |
|
SongZhang
|
e9956b5336
|
fix: 无台桌提示需要餐位费修复
|
2024-10-25 18:10:45 +08:00 |
|
SongZhang
|
42563c3ce0
|
fix: 无台桌下单报错修复
|
2024-10-25 17:36:40 +08:00 |
|
SongZhang
|
0f097f7d86
|
fix: 无台桌下单报错修复
|
2024-10-25 17:27:51 +08:00 |
|
SongZhang
|
96ecaa840e
|
feat: 不传递桌码不修改人数
|
2024-10-25 16:58:57 +08:00 |