 SongZhang
|
cc9cfceed4
|
退款金额
|
2024-10-12 14:41:21 +08:00 |
|
SongZhang
|
1c04a44278
|
外带不校验餐位费
|
2024-10-12 14:36:35 +08:00 |
|
SongZhang
|
00f15ef7ee
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-12 14:33:09 +08:00 |
|
SongZhang
|
6bccfb8036
|
退款金额展示有误fix
|
2024-10-12 14:32:58 +08:00 |
 wangw
|
e86a383c8c
|
未记录商品销售的bug
|
2024-10-12 14:16:59 +08:00 |
|
wangw
|
b0140e7b23
|
Merge branch 'ww' into test
|
2024-10-12 14:16:44 +08:00 |
|
wangw
|
70abb276bc
|
未记录商品销售的bug
|
2024-10-12 14:16:24 +08:00 |
|
SongZhang
|
ece7e3eb0e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-12 10:46:33 +08:00 |
|
SongZhang
|
90505fd354
|
订单创建失败不打印菜品票
|
2024-10-12 10:46:19 +08:00 |
Tankaikai
|
d2ed566348
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-12 10:44:17 +08:00 |
|
谭凯凯
|
0ab7e04fc8
|
适配打印机新参数
|
2024-10-12 10:44:10 +08:00 |
|
SongZhang
|
7379b1d85d
|
退菜同步修改订单金额
|
2024-10-12 10:20:02 +08:00 |
|
SongZhang
|
608fb72c78
|
订单添加支付时间
|
2024-10-12 09:15:30 +08:00 |
|
SongZhang
|
e1a5e491e5
|
订单查询修改
|
2024-10-11 18:17:49 +08:00 |
|
SongZhang
|
adceb75c5c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-11 17:09:34 +08:00 |
|
SongZhang
|
d335268a84
|
先付费模式创建订单之后清空台桌状态
|
2024-10-11 17:09:04 +08:00 |
|
wangw
|
7c7a42d58d
|
商品id
|
2024-10-11 16:56:43 +08:00 |
|
wangw
|
a0b1c60896
|
商品id
|
2024-10-11 16:56:11 +08:00 |
|
SongZhang
|
6f50e1e134
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-11 16:42:58 +08:00 |
|
SongZhang
|
857502e26e
|
先付费模式创建订单之后结束购物车状态
|
2024-10-11 16:42:35 +08:00 |
|
wangw
|
2e374dcda7
|
Merge branch 'ww' into test
|
2024-10-11 15:58:43 +08:00 |
|
wangw
|
080c426caa
|
耗材记录 排序报错
|
2024-10-11 15:58:21 +08:00 |
|
wangw
|
4f14f8c914
|
Merge branch 'ww' into test
|
2024-10-11 15:47:52 +08:00 |
|
wangw
|
5a2a18992a
|
耗材记录 报错
|
2024-10-11 15:47:20 +08:00 |
|
wangw
|
c8b2c5903a
|
Merge branch 'ww' into test
|
2024-10-11 15:41:26 +08:00 |
|
wangw
|
e8a7ab070b
|
耗材列表
绑定耗材
|
2024-10-11 15:40:15 +08:00 |
|
wangw
|
9fc2f9e702
|
商品列表 排序 报损 操作人
|
2024-10-11 14:47:04 +08:00 |
|
SongZhang
|
4d0bb753c4
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-11 14:46:40 +08:00 |
|
SongZhang
|
e74fc42cf7
|
订单查询接口修改
|
2024-10-11 14:46:19 +08:00 |
|
wangw
|
ee59a73d02
|
商品列表 排序 报损 操作人
|
2024-10-11 14:46:13 +08:00 |
|
谭凯凯
|
b7e9f74912
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-11 14:36:34 +08:00 |
|
SongZhang
|
713ff653ad
|
库存改为商品级库存
|
2024-10-11 14:14:10 +08:00 |
|
SongZhang
|
cc4d34b6fe
|
支付根据状态查询
|
2024-10-11 14:12:27 +08:00 |
|
SongZhang
|
fb7c22aacc
|
退款接口修改
|
2024-10-11 13:48:31 +08:00 |
|
SongZhang
|
c49088def2
|
下单校验餐位费
|
2024-10-11 11:45:41 +08:00 |
|
SongZhang
|
3b182796ab
|
orderDetail状态未流转fix
|
2024-10-11 11:27:01 +08:00 |
|
SongZhang
|
838265d73f
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-11 10:54:29 +08:00 |
|
SongZhang
|
4cd6d6742c
|
退款订单添加退款备注
|
2024-10-11 10:54:17 +08:00 |
|
wangw
|
3e3f8528f3
|
通用单位
|
2024-10-11 10:43:25 +08:00 |
|
Tankaikai
|
350012f368
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-11 10:42:42 +08:00 |
|
谭凯凯
|
12a5466e26
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-11 10:42:34 +08:00 |
|
wangw
|
4d7e108f83
|
通用单位
|
2024-10-11 10:42:23 +08:00 |
|
wangw
|
156428784d
|
导出方法
|
2024-10-11 09:51:11 +08:00 |
|
wangw
|
66f1fb3da8
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
|
2024-10-11 09:45:35 +08:00 |
|
wangw
|
846cbef3da
|
初始化单位，统计 关于客坐费没有规格问题
|
2024-10-11 09:44:18 +08:00 |
|
谭凯凯
|
8c8b49adb2
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-11 09:38:41 +08:00 |
|
SongZhang
|
504fec5011
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-10 16:58:01 +08:00 |
|
SongZhang
|
42c1c1da3f
|
扫码支付回调修改
|
2024-10-10 16:57:51 +08:00 |
|
wangw
|
cee923159c
|
Merge branch 'ww' into test
|
2024-10-10 16:20:54 +08:00 |
|
wangw
|
70d26b5c78
|
新增商品 修改商品 价格问题
|
2024-10-10 16:20:27 +08:00 |