|
|
e2a624e653
|
perf: 台桌列表增加分页
|
2024-10-25 09:57:08 +08:00 |
|
|
|
fa85c92d08
|
Merge branch 'ww' into test
|
2024-10-24 18:08:27 +08:00 |
|
|
|
b1e7095357
|
订单可用优惠券 /shop/storage/find
|
2024-10-24 18:06:44 +08:00 |
|
Tankaikai
|
12beeb1b51
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-24 16:42:35 +08:00 |
|
Tankaikai
|
25f856f11f
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-10-24 16:41:46 +08:00 |
|
谭凯凯
|
d2982d3528
|
完成新增会员接口开发
|
2024-10-24 16:41:03 +08:00 |
|
|
|
94b0a951a2
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-10-24 16:34:45 +08:00 |
|
|
|
537b9b408b
|
新增桌码绑定接口
|
2024-10-24 16:29:08 +08:00 |
|
|
|
6c2c12d95d
|
Merge remote-tracking branch 'refs/remotes/origin/dev' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpCashierCartService.java
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpShopTableService.java
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpCashierCartServiceImpl.java
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpShopTableServiceImpl.java
|
2024-10-24 15:48:55 +08:00 |
|
|
|
4ec0f04cc5
|
台桌列表未绑定台桌状态为unbind
|
2024-10-24 15:47:24 +08:00 |
|
|
|
473a8eaca5
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/resources/mapper/TbActivateMapper.xml
|
2024-10-24 15:29:05 +08:00 |
|
|
|
824985a6ad
|
多余内容删除
活动重写
优惠券重写
店铺新增字段
|
2024-10-24 15:28:15 +08:00 |
|
|
|
d15b17729c
|
新增台桌状态接口
|
2024-10-24 15:20:14 +08:00 |
|
|
|
743f59d4a3
|
开启库存校验库存数量
|
2024-10-24 14:12:40 +08:00 |
|
|
|
62a931145b
|
无桌台添加购物车修改
|
2024-10-24 13:25:54 +08:00 |
|
|
|
01efaac3ab
|
增加无桌台就餐
|
2024-10-24 11:43:46 +08:00 |
|
|
|
94e6794255
|
客座费选择接口修改
|
2024-10-24 11:43:46 +08:00 |
|
|
|
b356b3594d
|
创建订单修改餐位费校验
|
2024-10-24 11:43:44 +08:00 |
|
|
|
6f7459604c
|
创建订单修改餐位费校验
|
2024-10-24 11:43:42 +08:00 |
|
|
|
eaace1d576
|
创建订单修改餐位费校验
|
2024-10-24 11:43:41 +08:00 |
|
|
|
db0e01ecf7
|
增加无桌台就餐
|
2024-10-24 11:42:37 +08:00 |
|
|
|
bc90c47f2c
|
客座费选择接口修改
|
2024-10-24 09:43:05 +08:00 |
|
|
|
d2eae1734e
|
创建订单修改餐位费校验
|
2024-10-24 09:33:42 +08:00 |
|
|
|
4cdc0b5738
|
创建订单修改餐位费校验
|
2024-10-24 09:31:35 +08:00 |
|
|
|
b2f01ed453
|
创建订单修改餐位费校验
|
2024-10-24 09:24:58 +08:00 |
|
|
|
d99771f8e7
|
无台桌模式选择台桌接口修改
|
2024-10-24 09:07:48 +08:00 |
|
|
|
24a80cb24a
|
取餐码获取修改
|
2024-10-24 09:07:45 +08:00 |
|
|
|
84d967ca6b
|
退款校验退款金额
|
2024-10-24 09:07:43 +08:00 |
|
|
|
bc7d2430ba
|
修改订单详情餐位费返回结构
|
2024-10-24 09:07:43 +08:00 |
|
|
|
daccee5d04
|
修改订单详情餐位费返回结构
|
2024-10-24 09:07:42 +08:00 |
|
|
|
d53762e777
|
多次退款累加退款金额
|
2024-10-24 09:07:41 +08:00 |
|
|
|
47735d6f4b
|
订单支持多次退款
|
2024-10-24 09:07:39 +08:00 |
|
|
|
c2e481cd15
|
霸王餐查询修改接口
|
2024-10-24 09:07:38 +08:00 |
|
|
|
b0898330c9
|
赠送商品打包费不免除
|
2024-10-24 09:07:37 +08:00 |
|
|
|
8053c84331
|
退菜修改
|
2024-10-24 09:07:36 +08:00 |
|
|
|
c17326ffbe
|
无台桌模式选择台桌接口修改
|
2024-10-23 17:32:45 +08:00 |
|
|
|
a77c829287
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-23 16:49:59 +08:00 |
|
|
|
e663ebc8b9
|
取餐码获取修改
|
2024-10-23 16:49:47 +08:00 |
|
Tankaikai
|
8e5504da6c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-23 16:34:43 +08:00 |
|
谭凯凯
|
bc587c196d
|
Pad点餐后台配置接口
|
2024-10-23 16:34:32 +08:00 |
|
|
|
46ec8d47ff
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-23 15:07:03 +08:00 |
|
|
|
2efd81be50
|
退款校验退款金额
|
2024-10-23 15:06:51 +08:00 |
|
Tankaikai
|
d9859647b4
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-23 14:52:18 +08:00 |
|
谭凯凯
|
42fcd08d00
|
Pad点餐后台配置接口
|
2024-10-23 14:51:21 +08:00 |
|
|
|
0c7d9a7c7e
|
销量统计 时间筛选
|
2024-10-23 13:47:14 +08:00 |
|
|
|
82f7bd890e
|
修改订单详情餐位费返回结构
|
2024-10-23 11:12:31 +08:00 |
|
|
|
4d61647e0d
|
修改订单详情餐位费返回结构
|
2024-10-23 11:11:40 +08:00 |
|
|
|
f074f45f86
|
多次退款累加退款金额
|
2024-10-23 10:52:55 +08:00 |
|
|
|
5ce67b4014
|
订单支持多次退款
|
2024-10-23 10:22:40 +08:00 |
|
|
|
8fe78a48fd
|
霸王餐查询修改接口
|
2024-10-22 17:21:30 +08:00 |
|
