|
|
9055607154
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-30 09:39:10 +08:00 |
|
|
|
250f751e64
|
fix: 霸王餐扣减优惠券金额
|
2024-10-30 09:38:49 +08:00 |
|
|
|
a296718232
|
优惠券 find接口
|
2024-10-29 18:25:51 +08:00 |
|
|
|
270c274d63
|
fix: 优惠券查询sql修改
|
2024-10-29 17:35:42 +08:00 |
|
|
|
837aca3fd0
|
fix: 支付成功结束台桌状态
|
2024-10-29 16:43:55 +08:00 |
|
|
|
ec74e71f90
|
feat: 霸王餐充值接口修改
|
2024-10-29 14:32:56 +08:00 |
|
|
|
7184160296
|
Merge branch 'refs/heads/dev' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
|
2024-10-29 13:55:03 +08:00 |
|
|
|
8010ee3ffe
|
feat: 订单详情返回字段调整，增加registerType
|
2024-10-29 10:52:04 +08:00 |
|
|
|
1782605c12
|
feat: 霸王餐优惠券使用
|
2024-10-29 10:16:49 +08:00 |
|
|
|
2c27e96d92
|
feat: 霸王餐优惠券使用
|
2024-10-29 10:16:40 +08:00 |
|
|
|
ea025bd023
|
feat: memberIn增加充值类型type
|
2024-10-28 09:48:45 +08:00 |
|
|
|
2033d6c717
|
fix: 霸王餐充值订单id未保存修复
|
2024-10-28 09:42:11 +08:00 |
|
|
|
4fd3407f7a
|
fix: 霸王餐充值订单id未保存修复
|
2024-10-28 09:41:33 +08:00 |
|
|
|
05a7470c6f
|
fix: 霸王餐充值接口开发
|
2024-10-28 09:17:52 +08:00 |
|
|
|
1faa2cccc6
|
fix: 充值霸王餐查询修改
|
2024-10-26 16:51:41 +08:00 |
|
|
|
b5f8833c7e
|
fix: 充值霸王餐查询修改
|
2024-10-26 16:49:12 +08:00 |
|
|
|
43d6fa78dc
|
fix: 充值霸王餐查询修改
|
2024-10-26 16:47:38 +08:00 |
|
|
|
84fd16e912
|
fix: 充值霸王餐查询修改
|
2024-10-26 16:45:41 +08:00 |
|
|
|
46f5b10337
|
feat: 余额充值增加霸王餐选项
|
2024-10-26 16:41:09 +08:00 |
|
|
|
475da93c72
|
feat: 余额充值增加霸王餐选项
|
2024-10-26 16:39:03 +08:00 |
|
|
|
a58feeeef7
|
feat: 余额充值增加霸王餐选项
|
2024-10-26 16:29:34 +08:00 |
|
|
|
dbebe6d862
|
feat: 余额充值增加霸王餐选项
|
2024-10-26 15:52:46 +08:00 |
|
|
|
70f8dfd887
|
fix: 修复小程序点单台桌人数未更新
|
2024-10-26 14:36:31 +08:00 |
|
|
|
1d2fdef344
|
fix: 修复小程序点单台桌人数未更新
|
2024-10-26 14:35:27 +08:00 |
|
|
|
2302254783
|
fix: 修复小程序点单台桌人数未更新
|
2024-10-26 14:27:49 +08:00 |
|
|
|
ca28f90260
|
霸王餐相关接口
|
2024-10-26 14:26:20 +08:00 |
|
|
|
d442654c2f
|
fix: 未传递备注不修改订单备注
|
2024-10-26 09:16:48 +08:00 |
|
|
|
3573f6a0d6
|
feat: 霸王餐相关接口
|
2024-10-26 09:14:29 +08:00 |
|
|
|
a2ada0db33
|
支付成功清空台桌就餐人数等信息
|
2024-10-25 11:23:31 +08:00 |
|
|
|
2f324a741a
|
Merge branch 'ww' into test
|
2024-10-25 11:21:49 +08:00 |
|
|
|
1d48d04366
|
优惠券使用 以及 退券
|
2024-10-25 11:20:08 +08:00 |
|
|
|
8971c86d57
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-10-25 10:37:44 +08:00 |
|
|
|
0334d88a4f
|
用户下单同步修改台桌状态
|
2024-10-25 10:27:11 +08:00 |
|
|
|
2690f6a02a
|
多余代码删除
|
2024-10-24 13:27:56 +08:00 |
|
|
|
0bb24e7cbe
|
Merge branch 'ww' into test
|
2024-10-24 13:26:56 +08:00 |
|
|
|
d27e2e01b6
|
优惠券重写
|
2024-10-24 13:26:18 +08:00 |
|
|
|
a8e9924f74
|
取消接口修改
|
2024-10-24 10:41:26 +08:00 |
|
|
|
60e4a223cf
|
排队等待数量统计有误修复
|
2024-10-24 10:37:14 +08:00 |
|
|
|
646f201ce1
|
多余内容删除
|
2024-10-23 14:15:54 +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 |
|
