|
|
2a20b4b0d6
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-14 16:03:12 +08:00 |
|
|
|
3e45dd8068
|
商品是否展示字段修改
|
2024-10-14 16:03:02 +08:00 |
|
谭凯凯
|
c6d073a3fd
|
修改小程序支付回调payType
|
2024-10-14 15:43:44 +08:00 |
|
谭凯凯
|
c78d9d7294
|
调整打印机配置参数
|
2024-10-14 10:26:26 +08:00 |
|
|
|
2bccdb0b38
|
Merge branch 'ww' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
|
2024-10-12 15:03:29 +08:00 |
|
|
|
4ed35d3be3
|
商品共享库存字段 移除
|
2024-10-12 14:53:18 +08:00 |
|
|
|
6abcd3cdf8
|
订单列表返回时间
|
2024-10-12 14:22:31 +08:00 |
|
|
|
b8345065b9
|
订单列表返回时间
|
2024-10-12 14:20:28 +08:00 |
|
|
|
8556016e56
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-12 11:28:53 +08:00 |
|
|
|
c6392c8474
|
后付费订单不校验订单有效期
|
2024-10-12 11:28:43 +08:00 |
|
谭凯凯
|
b1a1754515
|
适配打印机新参数
|
2024-10-12 10:43:49 +08:00 |
|
|
|
e8c1ff1283
|
餐位费返回最新的
|
2024-10-11 14:02:58 +08:00 |
|
|
|
ff676dd34d
|
餐位费返回最新的
|
2024-10-11 14:00:40 +08:00 |
|
|
|
1d14546407
|
切换就餐模式返回数据修改
|
2024-10-10 15:22:17 +08:00 |
|
|
|
1aa729dc91
|
库存校验改为共享库存校验
|
2024-10-10 15:11:35 +08:00 |
|
|
|
4425812590
|
订单详情列表不返回餐位费信息
|
2024-10-10 14:39:36 +08:00 |
|
|
|
e577d89384
|
支付修改
|
2024-10-10 11:16:41 +08:00 |
|
|
|
f893e2e3bf
|
支付修改
|
2024-10-10 11:14:01 +08:00 |
|
|
|
2a398bedde
|
支付修改
|
2024-10-10 11:07:47 +08:00 |
|
|
|
0f8f694aea
|
创建订单同步修改购物车就餐类型
|
2024-10-10 10:59:08 +08:00 |
|
|
|
6fb186f1d5
|
创建订单同步修改购物车就餐类型
|
2024-10-10 10:53:47 +08:00 |
|
|
|
bd676eb78e
|
创建订单同步修改购物车就餐类型
|
2024-10-10 10:50:24 +08:00 |
|
|
|
d9c8b6f1b6
|
创建订单同步修改购物车就餐类型
|
2024-10-10 10:45:10 +08:00 |
|
|
|
d2a6b3973d
|
添加购物车修改
|
2024-10-10 10:04:35 +08:00 |
|
|
|
7315605bf0
|
餐位费选择修改
|
2024-10-10 09:46:09 +08:00 |
|
|
|
5f09f94657
|
支付取消接口
|
2024-10-09 17:41:07 +08:00 |
|
|
|
db7e0790b4
|
餐位费不放入购物车缓存
|
2024-10-09 16:56:58 +08:00 |
|
|
|
bd9aecf574
|
取消支付接口
|
2024-10-09 16:37:30 +08:00 |
|
|
|
9dc8ab767d
|
订单返回店铺二维码
|
2024-10-09 15:45:50 +08:00 |
|
|
|
e419446784
|
用户取消支付重新设置订单状态
|
2024-10-09 15:34:44 +08:00 |
|
|
|
117838304a
|
订单列表不返回餐位费信息
|
2024-10-09 15:24:22 +08:00 |
|
|
|
18a2157788
|
订单列表不返回餐位费信息
|
2024-10-09 15:13:15 +08:00 |
|
|
|
961baae3b2
|
购物车不返回餐位费信息
|
2024-10-09 15:05:58 +08:00 |
|
|
|
5fda8bf69a
|
查询店铺信息返回就餐人数
|
2024-10-09 15:03:51 +08:00 |
|
|
|
d29866da76
|
购物车查询修改
|
2024-10-09 13:50:59 +08:00 |
|
|
|
fa216760e9
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-08 16:17:09 +08:00 |
|
|
|
6097c45d68
|
外带模式创建订单不删除餐位费信息
|
2024-10-08 16:16:56 +08:00 |
|
Tankaikai
|
3db3a5b38d
|
Merge branch 'tkk' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
|
2024-10-08 16:02:30 +08:00 |
|
谭凯凯
|
a420de86d0
|
在支付回调中增加支付时间
|
2024-10-08 15:58:18 +08:00 |
|
|
|
3a9b453532
|
Merge branch 'ww' into test
|
2024-10-08 15:41:08 +08:00 |
|
|
|
0f000cd0e0
|
会员加入时间
|
2024-10-08 15:40:26 +08:00 |
|
|
|
ae9c4b3e84
|
Merge branch 'ww' into test
|
2024-10-08 15:27:37 +08:00 |
|
|
|
f7db296035
|
优惠卷 过滤余量为0的
|
2024-10-08 15:26:45 +08:00 |
|
|
|
c33b8d0ec6
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-08 15:17:20 +08:00 |
|
|
|
7623abe52d
|
Merge branch 'ww' into test
|
2024-10-08 15:16:37 +08:00 |
|
|
|
f52bb0dc15
|
订单支付时间
|
2024-10-08 15:16:17 +08:00 |
|
|
|
6724635bcf
|
外带模式创建订单设置打包费
|
2024-10-08 15:03:25 +08:00 |
|
|
|
65f52e8694
|
切换就餐模式计算打包费
|
2024-10-08 15:00:35 +08:00 |
|
|
|
c5015446df
|
切换就餐模式计算打包费
|
2024-10-08 14:59:24 +08:00 |
|
|
|
68a6326dac
|
餐位费信息获取修改
|
2024-10-08 13:43:21 +08:00 |
|
