Commit Graph

436 Commits

Author SHA1 Message Date
牛叉闪闪 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 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
牛叉闪闪 adb1c28bb8 修改 2024-08-29 16:51:15 +08:00
SongZhang e504c26978 1.代客下单 会员余额支付明细不匹配修复 2024-08-29 16:47:55 +08:00
牛叉闪闪 40b8198c7e 修改 2024-08-29 16:37:14 +08:00
SongZhang 8c18cb1347 1.代客下单 已出餐商品支持操作 2024-08-29 16:23:13 +08:00
牛叉闪闪 860211489e Merge remote-tracking branch 'origin/test' into test 2024-08-29 16:13:02 +08:00
牛叉闪闪 36c3c2e04b 修改 2024-08-29 16:12:46 +08:00
SongZhang 8b56b21021 Merge remote-tracking branch 'origin/test' into test 2024-08-29 16:09:11 +08:00
SongZhang dd26e7873b 1.代客下单 已出餐商品支持操作 2024-08-29 16:09:02 +08:00
牛叉闪闪 864793949b 修改 2024-08-29 16:04:30 +08:00
SongZhang ac82a2e447 1.代客下单 已出餐商品不支持操作 2024-08-29 16:00:12 +08:00
SongZhang 0facce27aa Merge remote-tracking branch 'origin/test' into test 2024-08-29 15:55:06 +08:00
SongZhang ee5cb7d4ba 1.代客下单 已出餐商品不支持操作 2024-08-29 15:54:26 +08:00
牛叉闪闪 d76558cce2 修改 2024-08-29 15:54:11 +08:00
牛叉闪闪 92c4f1ca3a Merge remote-tracking branch 'origin/test' into test 2024-08-29 15:52:30 +08:00
牛叉闪闪 35b9132eda 修改 2024-08-29 15:52:13 +08:00
SongZhang 12b87312fd Merge remote-tracking branch 'origin/test' into test 2024-08-29 15:49:39 +08:00
SongZhang c9b3cea5cd 1.代客下单 已出餐商品不支持操作 2024-08-29 15:49:28 +08:00
牛叉闪闪 08a9a26f2d 修改 2024-08-29 15:43:12 +08:00
牛叉闪闪 2f6a3d9c16 Merge remote-tracking branch 'origin/test' into test 2024-08-29 15:10:45 +08:00
牛叉闪闪 88526e0dd9 修改 2024-08-29 15:10:31 +08:00
SongZhang cf4116e4b9 Merge remote-tracking branch 'origin/test' into test 2024-08-29 14:52:11 +08:00