Commit Graph

665 Commits

Author SHA1 Message Date
a8e9924f74 取消接口修改 2024-10-24 10:41:26 +08:00
60e4a223cf 排队等待数量统计有误修复 2024-10-24 10:37:14 +08:00
谭凯凯
ec33f869e2 修改回调地址 2024-10-21 17:37:50 +08:00
谭凯凯
0eab904aa3 Accept Merge Request #258: (test -> dev)
Merge Request: 创建预发布环境

Created By: @谭凯凯
Accepted By: @谭凯凯
URL: https://g-cphe0354.coding.net/p/shouyinjixitong/d/wx-cashier-service/git/merge/258?initial=true
2024-10-21 17:36:47 +08:00
50f7ce4799 订阅修改 2024-10-18 15:41:03 +08:00
034df44373 排号人数统计修改 2024-10-18 15:23:12 +08:00
2d0447b340 取号没有桌型备注fix 2024-10-18 13:52:49 +08:00
a8c4097821 取号没有桌型备注fix 2024-10-18 13:51:09 +08:00
0fb95098e3 排队取号修改 2024-10-18 13:46:30 +08:00
eccfba8a0e 排队取号修改 2024-10-18 13:31:24 +08:00
72a196e1ea Merge remote-tracking branch 'origin/test' into test 2024-10-18 13:24:05 +08:00
10bc593d0f 排队取号修改 2024-10-18 13:23:53 +08:00
谭凯凯
68689e323e 支付回调bug修复 2024-10-16 14:49:14 +08:00
f91b7e25fd 创建订单修改 2024-10-15 16:46:24 +08:00
7a9b05662b Merge remote-tracking branch 'origin/test' into test 2024-10-15 16:30:16 +08:00
e964d277db 字段名修改 2024-10-15 16:29:48 +08:00
谭凯凯
3303b9277a 打印样式修改 2024-10-15 10:24:45 +08:00
谭凯凯
182c0d3eee 打印样式修改 2024-10-15 09:28:54 +08:00
谭凯凯
b9a2c3db5c 订单号命名修改 2024-10-14 18:28:18 +08:00
Tankaikai
a968950295 Merge remote-tracking branch 'origin/test' into test 2024-10-14 16:12:10 +08:00
谭凯凯
1ad93c2d4e 修改小程序支付回调payType 2024-10-14 16:12:03 +08:00
14d88e8a63 Merge remote-tracking branch 'origin/test' into test 2024-10-14 16:04:59 +08:00
b18d98b823 商品是否展示字段修改 2024-10-14 16:04:49 +08:00
Tankaikai
226b37af80 Merge remote-tracking branch 'origin/test' into test 2024-10-14 16:04:42 +08:00
谭凯凯
8b84694804 修改小程序支付回调payType 2024-10-14 16:04:28 +08:00
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