 SongZhang
|
db545ee118
|
1.代客下单 扫码支付校验相关参数
|
2024-09-09 10:38:57 +08:00 |
 wangw
|
fec443ce6c
|
Merge branch 'test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginProperties.java
# eladmin-system/src/main/resources/config/application-pre.yml
|
2024-09-09 09:59:01 +08:00 |
|
wangw
|
c618c712f3
|
验证码 区间
|
2024-09-06 17:02:29 +08:00 |
|
wangw
|
98bb93516f
|
去除实体类TagProductDepts 没有主键的提示
|
2024-09-06 11:14:50 +08:00 |
|
wangw
|
4e81e0fca1
|
获取临时上传凭证
|
2024-09-06 09:53:19 +08:00 |
|
wangw
|
28eb1496b9
|
上传版本文件修改为前端上传
|
2024-09-06 09:42:12 +08:00 |
|
wangw
|
81b6454557
|
获取临时上传凭证
|
2024-09-05 17:32:00 +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
|
5e59b19cec
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-05 09:56:48 +08:00 |
|
SongZhang
|
8f002b689d
|
1.代客下单 折扣差1修复
|
2024-09-05 09:56:38 +08:00 |
|
wangw
|
dfe0bb6154
|
预发布 mq端口修改
|
2024-09-05 09:55:05 +08:00 |
|
wangw
|
4bd99e7f6e
|
预发布 mq端口修改
|
2024-09-05 09:54:47 +08:00 |
|
wangw
|
1cb099702a
|
预发布 mq端口修改
|
2024-09-05 09:47:07 +08:00 |
|
wangw
|
37d16054c4
|
预发布 mq端口修改
|
2024-09-05 09:46:23 +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
|
53512a0b37
|
简化验证码计算
测试环境 修改数据连接地址
新增 pre 预发布配置
|
2024-09-04 11:32:01 +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
|
e131095e45
|
Merge branch 'test' into dev
|
2024-08-31 09:13:18 +08:00 |
|
yijiegong
|
c2843ecc3d
|
店铺扩展默认参数修改
|
2024-08-31 09:12:05 +08:00 |
|
SongZhang
|
a941cf56f2
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-08-30 17:31:53 +08:00 |
|
SongZhang
|
7b62f75cca
|
1.代客下单 创建订单保存台桌名称
|
2024-08-30 17:27:55 +08:00 |
|
SongZhang
|
68a96b405d
|
Merge remote-tracking branch 'origin/ww' into test
|
2024-08-30 16:46:41 +08:00 |
|
SongZhang
|
e9297f49a1
|
Merge remote-tracking branch 'origin/ww' into dev
|
2024-08-30 16:46:05 +08:00 |
|
SongZhang
|
1c5fb88b38
|
Merge remote-tracking branch 'origin/test' into dev
|
2024-08-30 16:24:13 +08:00 |
|
SongZhang
|
d6756ee2e3
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-30 15:27:42 +08:00 |