 SongZhang
|
a27f64dafa
|
增加异常反打实现，避免异常堆栈信息过长
|
2024-09-24 09:56:27 +08:00 |
|
SongZhang
|
ca49d31260
|
调整订单逻辑，增加店内外带用餐方式，增加多次下单标记
|
2024-09-24 09:55:21 +08:00 |
|
SongZhang
|
7adf50ab99
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-20 15:52:09 +08:00 |
|
SongZhang
|
753f3d9d8b
|
调整mapper扫描方式，增加请求信息打印
|
2024-09-20 15:51:59 +08:00 |
 yijiegong
|
43220a03ea
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 15:34:12 +08:00 |
|
yijiegong
|
851bbfc01e
|
Merge branch 'gyj' into test
|
2024-09-19 15:33:53 +08:00 |
|
yijiegong
|
45a6bcbe9d
|
Merge branch 'gyj' into dev
|
2024-09-19 15:32:36 +08:00 |
|
yijiegong
|
3ae12ce04d
|
PC 最新版本下载链接
|
2024-09-19 15:32:04 +08:00 |
|
SongZhang
|
fa94b0b1bf
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 15:31:10 +08:00 |
|
SongZhang
|
905063987a
|
增加排号小票打印处理
|
2024-09-19 15:30:50 +08:00 |
|
yijiegong
|
1ad6aa3de7
|
支付订单增加remark字段
|
2024-09-19 13:44:56 +08:00 |
|
yijiegong
|
f768f7f473
|
修改店铺二维码收款
|
2024-09-19 09:54:00 +08:00 |
|
yijiegong
|
d7f2d5afc1
|
修改支付宝支付
|
2024-09-18 18:17:28 +08:00 |
|
yijiegong
|
46205fb7ce
|
修改支付宝支付 地址
|
2024-09-18 17:48:29 +08:00 |
|
yijiegong
|
53597281d9
|
修改支付宝支付 地址
|
2024-09-18 17:42:42 +08:00 |
|
yijiegong
|
9ddef54afd
|
Merge branch 'dev' into test
|
2024-09-15 19:27:01 +08:00 |
|
yijiegong
|
4ee6999b16
|
耗材消耗 查询 不管是否开启库存检测
|
2024-09-15 19:26:42 +08:00 |
|
yijiegong
|
a84f3f39b3
|
请求员工权限
|
2024-09-14 18:04:47 +08:00 |
|
SongZhang
|
89ac3c9e25
|
单元测试
|
2024-09-14 17:50:21 +08:00 |
|
SongZhang
|
808d363daa
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 17:50:01 +08:00 |
|
SongZhang
|
eb8a53718d
|
单元测试
|
2024-09-14 17:49:49 +08:00 |
 wangw
|
8ed1b242ff
|
Merge branch 'ww' into test
|
2024-09-14 17:41:54 +08:00 |
|
wangw
|
04718abc01
|
增加sql记录
|
2024-09-14 17:40:43 +08:00 |
|
SongZhang
|
ba54bf9967
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 11:50:17 +08:00 |
|
SongZhang
|
b74441a62e
|
打印整合修改
|
2024-09-14 11:49:56 +08:00 |
牛叉闪闪
|
dbb66f93fa
|
添加pcpay 支付
|
2024-09-14 09:18:57 +08:00 |
|
SongZhang
|
5c0adcbe37
|
飞鹅打印折扣空值判断
|
2024-09-13 15:59:33 +08:00 |
|
SongZhang
|
92008db954
|
创建订单打包费默认值
|
2024-09-13 15:50:22 +08:00 |
|
SongZhang
|
eb0139282b
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-13 15:32:21 +08:00 |
|
SongZhang
|
9a07219470
|
飞鹅打印机退单小票功能放开
|
2024-09-13 15:32:12 +08:00 |
|
牛叉闪闪
|
51b66652d4
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-09-13 11:09:25 +08:00 |
|
牛叉闪闪
|
074cc5374d
|
添加pcpay 支付
|
2024-09-13 11:08:33 +08:00 |
|
牛叉闪闪
|
0775b09c77
|
添加pcpay 支付
|
2024-09-13 11:06:36 +08:00 |
|
wangw
|
2d6c02cfd5
|
Merge branch 'ww' into test
|
2024-09-13 10:47:36 +08:00 |
|
wangw
|
724d5fc2da
|
店铺信息
运营模式
restaurant 餐饮版 先下单后支付
munchies 快餐版（先支付后下单）
是否开启桌位费 0否1是
桌位费
就餐模式 堂食 dine-in 外带 take-out
|
2024-09-13 10:45:03 +08:00 |
|
SongZhang
|
3029e6c8be
|
飞鹅打印机打印菜品小票根据使用类型区分type
|
2024-09-13 10:10:43 +08:00 |
|
SongZhang
|
2af6d62737
|
飞鹅打印机打印菜品小票根据使用类型区分type
|
2024-09-13 10:08:18 +08:00 |
|
牛叉闪闪
|
6a9f084df1
|
添加pcpay 支付
|
2024-09-12 14:34:19 +08:00 |
|
牛叉闪闪
|
73bad5713a
|
添加pcpay 支付
|
2024-09-12 14:08:19 +08:00 |
|
牛叉闪闪
|
2695748ab7
|
添加pcpay 支付
|
2024-09-12 14:08:03 +08:00 |
|
SongZhang
|
668edeb23c
|
添加单独打票相关mq处理
|
2024-09-12 11:20:31 +08:00 |
|
yijiegong
|
71b6cfe95c
|
退款密码校验修改
|
2024-09-07 00:19:49 +08:00 |
|
yijiegong
|
a9d0810d1a
|
Merge branch 'test' into dev
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java
|
2024-09-06 23:53:05 +08:00 |
|
牛叉闪闪
|
7d713a0a50
|
修改
|
2024-09-06 17:38:19 +08:00 |
|
牛叉闪闪
|
4e2da5c676
|
修改
|
2024-09-06 17:23:52 +08:00 |
|
SongZhang
|
0d5dec10c6
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-06 11:37:32 +08:00 |
|
SongZhang
|
106c89ec58
|
1.生成取餐码redis报错修复
|
2024-09-06 11:37:22 +08:00 |
|
牛叉闪闪
|
781570e2bf
|
修改
|
2024-09-06 11:09:57 +08:00 |
|
SongZhang
|
b88c269a1a
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-06 10:38:21 +08:00 |
|
SongZhang
|
eb1603a4ee
|
1.创建订单普通下单不沿用上笔
|
2024-09-06 10:38:10 +08:00 |
|
牛叉闪闪
|
f96c64f343
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-09-06 10:23:53 +08:00 |
|
牛叉闪闪
|
c2555d890f
|
修改
|
2024-09-06 10:23:21 +08:00 |
|
牛叉闪闪
|
4bc2ed0bfd
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-09-05 17:39:54 +08:00 |
|
牛叉闪闪
|
9be00af38c
|
修改
|
2024-09-05 17:39:16 +08:00 |
|
牛叉闪闪
|
ffa9bab489
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-09-05 17:34:41 +08:00 |
|
牛叉闪闪
|
b8f04c65c0
|
修改
|
2024-09-05 17:34:14 +08:00 |
|
SongZhang
|
e086c4df95
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/main/resources/application-pre.yml
|
2024-09-05 17:07:52 +08:00 |
|
牛叉闪闪
|
09a4918e13
|
修改
|
2024-09-05 17:06:51 +08:00 |
|
SongZhang
|
20d86c6a75
|
1.支付完成清除缓存
|
2024-09-05 16:14:00 +08:00 |
|
SongZhang
|
a3956663d7
|
1.支付完成清除缓存
|
2024-09-05 16:11:19 +08:00 |
|
SongZhang
|
b8b8ee2bf2
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-05 16:06:32 +08:00 |
|
SongZhang
|
c7626c352a
|
1.支付完成清除缓存
|
2024-09-05 16:06:22 +08:00 |
|
牛叉闪闪
|
d13d16238e
|
修改
|
2024-09-05 15:45:12 +08:00 |
|
牛叉闪闪
|
13fedb841b
|
修改
|
2024-09-05 15:24:49 +08:00 |
|
SongZhang
|
e1bd478ae5
|
1.添加购物车逻辑修改
|
2024-09-05 11:43:22 +08:00 |
|
SongZhang
|
8eab206fff
|
1.添加购物车逻辑修改
|
2024-09-05 11:34:14 +08:00 |
|
SongZhang
|
0600a1d90e
|
1.添加购物车逻辑修改
|
2024-09-05 11:28:56 +08:00 |
|
SongZhang
|
6360d01041
|
1.添加购物车逻辑修改
|
2024-09-05 11:24:42 +08:00 |
|
SongZhang
|
39fb09e99a
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-05 11:13:52 +08:00 |
|
SongZhang
|
fc00b49806
|
1.打票添加日志
|
2024-09-05 11:13:40 +08:00 |
|
牛叉闪闪
|
3234ba957f
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-09-05 11:07:13 +08:00 |
|
牛叉闪闪
|
bca3381ec3
|
修改
|
2024-09-05 11:06:36 +08:00 |
|
SongZhang
|
af78237806
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-05 10:42:06 +08:00 |
|
SongZhang
|
01df55d60b
|
1.代客下单 创建订单查询条件修改
|
2024-09-05 10:41:56 +08:00 |
|
wangw
|
3b3eda15ef
|
pre 内网访问数据库
|
2024-09-05 10:09:47 +08:00 |
|
牛叉闪闪
|
92d0fb23c8
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-09-05 10:00:20 +08:00 |
|
牛叉闪闪
|
9f62cd4165
|
修改
|
2024-09-05 09:59:19 +08:00 |
|
wangw
|
6acd14da8a
|
1
|
2024-09-04 14:20:56 +08:00 |
|
wangw
|
3528ebb0c4
|
测试环境 修改数据连接地址
新增 pre 预发布配置
|
2024-09-04 11:31:32 +08:00 |
|
wangw
|
15ef38936b
|
测试环境 修改数据连接地址
新增 pre 预发布配置
|
2024-09-04 11:29:27 +08:00 |
|
SongZhang
|
1d644bc232
|
1.代客下单 打票未清空缓存修复
|
2024-09-03 11:09:12 +08:00 |
|
SongZhang
|
f3ad47f0f3
|
1.代客下单 加入购物车同步保存小程序缓存
|
2024-09-03 10:39:39 +08:00 |
|
牛叉闪闪
|
3e3a23becd
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-09-02 10:59:37 +08:00 |
|
牛叉闪闪
|
2985ae0f14
|
修改
|
2024-09-02 10:58:59 +08:00 |
|
牛叉闪闪
|
a5046976c5
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-09-02 10:56:28 +08:00 |
|
牛叉闪闪
|
637a0cf315
|
修改
|
2024-09-02 10:55:37 +08:00 |
|
SongZhang
|
040db99d86
|
1.打票逻辑修改
|
2024-09-02 10:32:55 +08:00 |
|
SongZhang
|
4101c5235b
|
1.获取桌码通过tableId获取
|
2024-08-31 16:45:08 +08:00 |
|
SongZhang
|
ed78691326
|
1.退款下票数量错误fix
|
2024-08-30 16:45:19 +08:00 |
|
SongZhang
|
cff864f2da
|
1.退款下票数量错误fix
|
2024-08-30 15:47:38 +08:00 |
|
SongZhang
|
f857715b0f
|
1.代客下单 商品数量减少增加打印退单票据
|
2024-08-30 15:15:54 +08:00 |
|
SongZhang
|
83d3aa444f
|
1.代客下单 商品数量减少增加打印退单票据
|
2024-08-30 15:06:56 +08:00 |
|
牛叉闪闪
|
e0b62b66d4
|
修改
|
2024-08-30 14:40:43 +08:00 |
|
yijiegong
|
187a757575
|
密码校验修改
|
2024-08-30 11:16:36 +08:00 |
|
SongZhang
|
32590bb35a
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-30 10:42:28 +08:00 |
|
SongZhang
|
4bea33ff3e
|
1.代客下单退款单打印
|
2024-08-30 10:42:17 +08:00 |
|
yijiegong
|
bf18452189
|
查询店铺操作密码设置
|
2024-08-30 10:34:45 +08:00 |
|
SongZhang
|
0172bd0478
|
1.打印折扣值为空报错修复
|
2024-08-30 09:59:33 +08:00 |
|
牛叉闪闪
|
203332e232
|
修改
|
2024-08-29 17:31:20 +08:00 |
|
牛叉闪闪
|
84e4a21064
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-29 16:52:23 +08:00 |