Commit Graph

594 Commits

Author SHA1 Message Date
wangw 05adbeb584 sql执行时长 2024-09-09 18:18:30 +08:00
SongZhang 50e0f09be8 1.代客下单 扫码支付记录不准确修复 2024-09-09 10:55:19 +08:00
SongZhang 09252dda7c Merge remote-tracking branch 'origin/test' into test 2024-09-09 10:39:07 +08:00
SongZhang db545ee118 1.代客下单 扫码支付校验相关参数 2024-09-09 10:38:57 +08:00
wangw c618c712f3 验证码 区间 2024-09-06 17:02:29 +08:00
wangw 98bb93516f 去除实体类TagProductDepts 没有主键的提示 2024-09-06 11:14:50 +08:00
SongZhang 72a3057126 1.代客下单 失败添加消息提示 2024-09-05 15:04:23 +08:00
SongZhang b7fc525623 1.代客下单 失败添加消息提示 2024-09-05 15:01:31 +08:00
SongZhang f458e6f77e Merge remote-tracking branch 'origin/test' into test 2024-09-05 14:57:27 +08:00
SongZhang 7b91549664 1.代客下单 失败添加消息提示 2024-09-05 14:57:15 +08:00
wangw 10373ab45f 版本管理列表 时间倒叙 2024-09-05 11:01:36 +08:00
SongZhang a08d181e77 Merge remote-tracking branch 'origin/test' into test 2024-09-05 10:54:58 +08:00
SongZhang 50faef4a20 1.代客下单 失败添加消息提示 2024-09-05 10:54:36 +08:00
wangw 782a152243 pre 内网访问数据库 2024-09-05 10:11:11 +08:00
SongZhang 8f002b689d 1.代客下单 折扣差1修复 2024-09-05 09:56:38 +08:00
SongZhang 3174c9abf3 1.代客下单 扫码支付,储值卡扫码支付, 台桌状态 2024-09-05 09:27:35 +08:00
SongZhang fed5b28ce2 1.代客下单 扫码支付,储值卡扫码支付, 台桌状态 2024-09-05 09:24:50 +08:00
wangw be701b46ec 简化验证码计算
测试环境 修改数据连接地址
新增 pre 预发布配置
2024-09-04 11:30:56 +08:00
SongZhang 8247b3b4bd 1.代客下单 扫码支付,储值卡扫码支付 2024-09-04 10:19:08 +08:00
SongZhang 963920fd2a 1.代客下单 扫码支付,储值卡扫码支付 2024-09-04 10:18:07 +08:00
SongZhang 0b645bd695 1.代客下单 扫码支付,储值卡扫码支付 2024-09-04 09:21:25 +08:00
SongZhang 44329cc64e 1.代客下单 支付折扣 2024-09-03 11:09:36 +08:00
wangw 37be5a521e 设置验证码接口 2024-09-03 10:57:18 +08:00
SongZhang d63861ac13 Merge remote-tracking branch 'origin/test' into test 2024-09-03 10:42:09 +08:00
SongZhang 1b9b088e43 1.代客下单 创建订单删除小程序购物车缓存 2024-09-03 10:41:57 +08:00
牛叉闪闪 6e31bb6251 添加会员流水 2024-09-02 16:27:55 +08:00
牛叉闪闪 4b5c272cd9 添加会员流水 2024-09-02 15:03:40 +08:00
SongZhang 5480d0eb5f Merge remote-tracking branch 'origin/test' into test 2024-09-02 14:51:05 +08:00
SongZhang be4f8cbbdd 1.代客下单 创建订单增加锁
2.代客下单 主扫支付
2024-09-02 14:50:40 +08:00
牛叉闪闪 923c204c3c Merge remote-tracking branch 'origin/hph' into test
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
2024-09-02 14:43:29 +08:00
牛叉闪闪 b1219a114b 添加会员流水 2024-09-02 14:41:57 +08:00
牛叉闪闪 94e875008b Merge remote-tracking branch 'origin/test' into test 2024-09-01 13:37:28 +08:00
牛叉闪闪 e823832cdb 添加多规格商品价格最大值 2024-09-01 13:36:28 +08:00
SongZhang cce10b9475 Merge remote-tracking branch 'origin/test' into test 2024-08-31 16:48:48 +08:00
SongZhang 68b9b1ab98 1.代客下单 创建订单保存订单id到缓存
2.修复挂起订单重复打票
2024-08-31 16:48:37 +08:00
yijiegong c2843ecc3d 店铺扩展默认参数修改 2024-08-31 09:12:05 +08:00
SongZhang 7b62f75cca 1.代客下单 创建订单保存台桌名称 2024-08-30 17:27:55 +08:00
SongZhang d6756ee2e3 Merge remote-tracking branch 'origin/test' into test 2024-08-30 15:27:42 +08:00
SongZhang 26f6af0256 1.代客下单 添加购物车接口添加id 2024-08-30 15:27:31 +08:00
yijiegong 77f01cabdc userId 为null处理 2024-08-30 11:49:42 +08:00
yijiegong 33a0722c8c userId 为null处理 2024-08-30 11:33:10 +08:00
yijiegong b0392f70e1 userId 为null处理 2024-08-30 11:32:09 +08:00
yijiegong 9ea2ecf552 查询会员订单数量bug修复 2024-08-30 11:26:23 +08:00
SongZhang 52410b73f1 1.代客下单 支持下单修改会员 2024-08-29 18:26:22 +08:00
SongZhang a68b7ee991 1.代客下单,折扣 2024-08-29 17:59:16 +08:00
SongZhang 71bc936074 1.代客下单,折扣 2024-08-29 17:57:56 +08:00
SongZhang 297ccc0233 1.代客下单,折扣 2024-08-29 14:13:19 +08:00
SongZhang 417451f432 1.修改会员余额支付备注 2024-08-29 13:45:49 +08:00
SongZhang 0fe0722893 1.代客下单 挂起订单增加masterId 2024-08-29 11:27:51 +08:00
wangw dc176f6e46 代客下单 商品列表 数据缺失问题 2024-08-28 18:04:57 +08:00