Tankaikai
|
fe7b4a9754
|
支付宝小程序下单退款
|
2025-03-13 10:26:32 +08:00 |
|
Tankaikai
|
4bd912cd89
|
Merge remote-tracking branch 'origin/test' into dev
|
2025-01-16 16:23:31 +08:00 |
|
谭凯凯
|
8270ffdc44
|
点餐机退款支持支付宝
|
2025-01-16 16:10:14 +08:00 |
张松
|
2528ce8317
|
Merge branch 'refs/heads/test' into dev
|
2024-12-24 13:39:08 +08:00 |
|
谭凯凯
|
b7293ca099
|
打印结算单过滤已退菜的菜品
|
2024-12-24 11:05:50 +08:00 |
|
张松
|
4fa9644ce2
|
fix: 台桌根据店铺id查询
|
2024-12-21 09:20:31 +08:00 |
|
张松
|
9371c2b85a
|
fix: 退款修改
|
2024-12-20 10:45:42 +08:00 |
|
张松
|
1eb2c70ea7
|
fix: 退款修改
|
2024-12-20 10:24:27 +08:00 |
|
张松
|
e1a0698883
|
fix: 订单查询过滤掉退款订单
|
2024-12-20 10:16:34 +08:00 |
|
张松
|
0e5ac1ceb5
|
fix: 订单查询过滤掉退款订单
|
2024-12-20 10:11:23 +08:00 |
|
张松
|
8fe450dd70
|
fix: 台桌查询修改
|
2024-12-20 09:45:00 +08:00 |
|
张松
|
5cd84c91fa
|
fix: 客座费placenum默认值修改
|
2024-12-20 09:17:53 +08:00 |
|
张松
|
004b3294c4
|
fix: 购物车增加称重商品标识
|
2024-12-19 17:58:04 +08:00 |
|
张松
|
df92ad6179
|
fix: 挂账订单保存挂账人id丢失修复
|
2024-12-19 17:41:02 +08:00 |
|
张松
|
ce108efa97
|
fix: 赠送单开商品处理
|
2024-12-19 14:44:02 +08:00 |
|
张松
|
6c940850cb
|
fix: 赠送单开商品处理
|
2024-12-19 14:40:18 +08:00 |
|
张松
|
5557b2b360
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-19 09:50:48 +08:00 |
|
张松
|
51d03bbe54
|
fix: 挂账支付实现
|
2024-12-19 09:50:38 +08:00 |
|
谭凯凯
|
ba813d268e
|
赠菜小票需求
|
2024-12-18 14:54:22 +08:00 |
|
张松
|
569a465850
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-18 11:08:10 +08:00 |
|
张松
|
71de503e22
|
fix: 挂账支付实现
|
2024-12-18 11:08:01 +08:00 |
|
张松
|
570c94450b
|
fix: 充值xml int影响行数为null修复
|
2024-12-17 19:04:02 +08:00 |
|
Tankaikai
|
5100cfa1be
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-17 19:02:55 +08:00 |
|
Tankaikai
|
dcc60f5841
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-17 19:01:02 +08:00 |
|
谭凯凯
|
59bd4110e5
|
解决小程序下单isPrint is null的bug
|
2024-12-17 19:00:57 +08:00 |
|
Tankaikai
|
a0fa4bb531
|
Merge remote-tracking branch 'origin/test' into dev
|
2024-12-17 17:59:07 +08:00 |
|
张松
|
cd66a1b268
|
Merge branch 'refs/heads/dev' into test
|
2024-12-17 15:00:19 +08:00 |
|
张松
|
21ae260976
|
Merge branch 'refs/heads/dev-3.0.0' into dev
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
|
2024-12-17 15:00:06 +08:00 |
|
张松
|
b88509133c
|
fix: 退款修改
|
2024-12-17 14:58:01 +08:00 |
|
张松
|
c815a7b061
|
fix: 会员支付修改
|
2024-12-17 14:42:18 +08:00 |
|
张松
|
255ce6a491
|
Merge branch 'refs/heads/dev-3.0.0' into dev
|
2024-12-17 14:28:58 +08:00 |
|
张松
|
2c69dcc4d3
|
fix: 退款积分空值判断
|
2024-12-17 14:28:23 +08:00 |
|
张松
|
f243d83de8
|
fix: 退款优惠券为null处理
|
2024-12-17 14:25:58 +08:00 |
|
张松
|
f42ab0d8b9
|
fix: 退款优惠券为null处理
|
2024-12-17 14:24:38 +08:00 |
|
张松
|
0767fe5e0f
|
Merge branch 'refs/heads/dev' into test
|
2024-12-17 13:34:52 +08:00 |
|
张松
|
96247fab7d
|
Merge remote-tracking branch 'origin/dev-3.0.0' into dev
|
2024-12-17 13:34:09 +08:00 |
|
张松
|
6e7fcd6404
|
fix: 无台桌不校验就餐模式
|
2024-12-17 13:32:12 +08:00 |
|
谭凯凯
|
30c62c9a71
|
挂账需求，移植到点餐机端
|
2024-12-17 13:31:47 +08:00 |
|
张松
|
ad776d7ff4
|
fix: 商品列表不查询优惠券商品
|
2024-12-17 13:26:51 +08:00 |
|
张松
|
a9903124d5
|
fix: 无台桌不校验就餐模式
|
2024-12-17 13:23:17 +08:00 |
|
张松
|
a3d6cc105a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-17 13:22:02 +08:00 |
|
张松
|
2a48cfa63f
|
fix: 无台桌不校验就餐模式
|
2024-12-17 13:21:50 +08:00 |
|
Tankaikai
|
f47038bbe5
|
Merge remote-tracking branch 'origin/test' into dev
|
2024-12-17 10:09:13 +08:00 |
|
张松
|
5f0950f17f
|
fix: 未下单商品不允许转台并台
|
2024-12-17 09:20:13 +08:00 |
|
张松
|
6f89b2eb3d
|
fix: 清空购物车修改
|
2024-12-16 17:13:18 +08:00 |
|
张松
|
b13db23b90
|
fix: 清空购物车修改
|
2024-12-16 17:09:02 +08:00 |
|
张松
|
0a89b6d67c
|
fix: 转桌不打票
|
2024-12-16 16:54:28 +08:00 |
|
张松
|
2231792463
|
fix: 下单次数修复
|
2024-12-16 16:46:12 +08:00 |
|
张松
|
929a694284
|
fix: 购物车角标数量修复
|
2024-12-16 16:43:12 +08:00 |
|
张松
|
cff2c0e38a
|
fix: 购物车角标数量修复
|
2024-12-16 16:41:02 +08:00 |