 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 |
|
wangw
|
59843ce046
|
代客下单 createOrder 报错问题
|
2024-08-28 17:32:07 +08:00 |
|
wangw
|
979a3a6ade
|
版本文件 接口记录
|
2024-08-28 16:21:55 +08:00 |
|
wangw
|
17fc234975
|
版本管理 和 版本文件上传
|
2024-08-28 15:45:46 +08:00 |
|
wangw
|
09c6cd178a
|
订单生成 库存消耗记录 并记录销量
|
2024-08-28 15:45:21 +08:00 |
|
wangw
|
fcff40f72b
|
店铺扩展信息 初始化数据
|
2024-08-28 15:44:33 +08:00 |
|
牛叉闪闪
|
221ad5a8d4
|
添加退款、会员退款、会员充值控制
|
2024-08-28 14:09:56 +08:00 |
|
yijiegong
|
8558343524
|
Merge branch 'gyj' into test
|
2024-08-28 13:35:19 +08:00 |
|
yijiegong
|
e48029a9a4
|
广告查询bug修改
|
2024-08-28 13:34:11 +08:00 |
|
wangw
|
489b3597d6
|
店铺扩展数据 初始化四条数据
|
2024-08-27 17:57:13 +08:00 |
|
牛叉闪闪
|
2ca427f808
|
添加退款、会员退款、会员充值控制
|
2024-08-27 17:33:10 +08:00 |
|
yijiegong
|
e9711dffe3
|
Merge branch 'gyj' into test
|
2024-08-27 16:00:10 +08:00 |
|
yijiegong
|
d7fe7cf40a
|
订单查询增加userId参数筛选
|
2024-08-27 15:59:43 +08:00 |
|
SongZhang
|
30407b1715
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-27 15:58:45 +08:00 |
|
SongZhang
|
2e5cc6ab92
|
1.代客下单 specSnap为null fix
|
2024-08-27 15:53:38 +08:00 |
|
wangw
|
b01812bce9
|
获取会员页面 二维码
|
2024-08-27 15:47:29 +08:00 |
|
牛叉闪闪
|
58a3ac0ed0
|
添加退款、会员退款、会员充值控制
|
2024-08-27 14:42:19 +08:00 |
|
yijiegong
|
6863fbc100
|
Merge branch 'test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
|
2024-08-27 11:06:16 +08:00 |
|
SongZhang
|
4929e467ab
|
1.代客下单 masterId实时更新修复
|
2024-08-27 10:44:50 +08:00 |