|
|
95c22ee51c
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-07-12 14:31:07 +08:00 |
|
|
|
1fd127023f
|
耗材重复扣取问题
|
2024-07-12 14:03:27 +08:00 |
|
|
|
53eea41196
|
商品列表 起售
|
2024-07-11 18:22:25 +08:00 |
|
|
|
989bdbad73
|
1.tb_shop_open_id多条数据查询问题
|
2024-07-11 16:03:45 +08:00 |
|
|
|
4e388ea951
|
1.tb_shop_open_id多条数据查询问题
|
2024-07-11 15:48:15 +08:00 |
|
|
|
3591d8f675
|
Merge branch 'feature-商品起售数量' into dev
|
2024-07-11 15:41:49 +08:00 |
|
|
|
719d578a9c
|
1.库存预警不提示修复
|
2024-07-11 11:45:56 +08:00 |
|
|
|
1487d5a6b1
|
商品起售
|
2024-07-11 10:28:20 +08:00 |
|
|
|
9c9c7d8608
|
1.库存预警提示语修改
2.库存预警30分钟内只推送一次
3.点歌支付成功同步保存平台订单号
|
2024-07-11 09:36:26 +08:00 |
|
韩鹏辉
|
736e30543d
|
Merge remote-tracking branch 'origin/dev' into hph
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
|
2024-07-11 09:30:28 +08:00 |
|
GYJ
|
4b2996adb3
|
修改点歌逻辑
|
2024-07-10 18:45:23 +08:00 |
|
GYJ
|
89af38dc15
|
Merge branch 'refs/heads/dev' into gyj
|
2024-07-10 15:49:38 +08:00 |
|
韩鹏辉
|
96b58cf5a2
|
修改
|
2024-07-10 15:13:50 +08:00 |
|
韩鹏辉
|
8ce62ee06c
|
Merge remote-tracking branch 'origin/dev' into hph
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java
|
2024-07-10 15:11:00 +08:00 |
|
韩鹏辉
|
288a8b76be
|
修改
|
2024-07-10 15:10:21 +08:00 |
|
韩鹏辉
|
dba97d4dec
|
添加异常
|
2024-07-10 14:55:09 +08:00 |
|
GYJ
|
402a9b635f
|
删除无用文件
|
2024-07-10 14:50:21 +08:00 |
|
|
|
ec0dbc3337
|
微信小程序点歌接口
|
2024-07-09 17:16:11 +08:00 |
|
GYJ
|
b1eb885008
|
Merge branch 'refs/heads/dev'
|
2024-07-06 22:33:56 +08:00 |
|
GYJ
|
71bc50e8bd
|
打开小票二维码
|
2024-07-06 22:33:42 +08:00 |
|
GYJ
|
2810d83dc1
|
Merge branch 'refs/heads/dev'
|
2024-07-06 20:23:36 +08:00 |
|
|
|
a11222d797
|
创建订单校验库存预警
|
2024-07-06 16:39:48 +08:00 |
|
GYJ
|
239c209878
|
Merge branch 'refs/heads/dev'
|
2024-07-06 10:27:43 +08:00 |
|
韩鹏辉
|
0b27c6801e
|
Merge branch 'hph' into dev
|
2024-07-06 10:23:38 +08:00 |
|
韩鹏辉
|
2f686e8b04
|
添加耗材
|
2024-07-06 10:23:10 +08:00 |
|
GYJ
|
31ca409423
|
Merge branch 'refs/heads/dev'
|
2024-07-05 14:57:37 +08:00 |
|
|
|
ccd247cff2
|
下单 打票重试机制 4秒重试 5次 5次后丢失
下单 order数据 不发给生成订单的用户
|
2024-07-05 14:16:46 +08:00 |
|
|
|
b16ad91a06
|
修改校验库存
|
2024-07-05 11:58:29 +08:00 |
|
|
|
979e2b3567
|
修改校验库存
|
2024-07-05 11:31:37 +08:00 |
|
|
|
cfd8bca747
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-07-05 11:30:22 +08:00 |
|
韩鹏辉
|
9c4fcc98b4
|
添加耗材
|
2024-07-05 10:17:03 +08:00 |
|
韩鹏辉
|
fd465c9fe7
|
添加耗材
|
2024-07-05 10:13:55 +08:00 |
|
韩鹏辉
|
b236cac065
|
添加耗材
|
2024-07-05 10:05:57 +08:00 |
|
|
|
6908d8eaf3
|
日志文件 50MB 进行一次打包
|
2024-07-05 09:51:42 +08:00 |
|
|
|
3ea12c88fe
|
加入购物车校验库存
|
2024-07-05 09:12:09 +08:00 |
|
|
|
c88b085a4e
|
未开启库存不校验库存数量
|
2024-07-04 16:40:33 +08:00 |
|
GYJ
|
435c81a4f4
|
Merge branch 'refs/heads/dev'
|
2024-07-04 09:32:14 +08:00 |
|
|
|
f041c983a5
|
创建订单扣除库存
|
2024-07-04 09:09:07 +08:00 |
|
|
|
376134fc19
|
shopUser增加 店铺名称字段
|
2024-07-03 16:29:11 +08:00 |
|
|
|
09bfa5bdec
|
创建订单扣除库存
|
2024-07-03 10:12:06 +08:00 |
|
|
|
dfdeca9612
|
下单发送create消息，处理耗材
|
2024-07-02 16:37:14 +08:00 |
|
|
|
57160c66c5
|
库存预警支持多用户提醒
|
2024-07-02 15:19:40 +08:00 |
|
|
|
ac3ef8d8d3
|
购物车不操作库存/耗材
|
2024-07-02 11:40:50 +08:00 |
|
|
|
47838fe10d
|
新增下单库存预警消息推送
|
2024-07-02 11:27:07 +08:00 |
|
GYJ
|
c80d972fea
|
添加isDistribute注释
|
2024-07-02 10:12:24 +08:00 |
|
韩鹏辉
|
40cc8fac70
|
添加耗材
|
2024-06-28 18:00:28 +08:00 |
|
|
|
7e00911def
|
新增下单库存预警消息推送
|
2024-06-28 14:13:41 +08:00 |
|
|
|
dbfd971f26
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserShopMsgMapper.java
# src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserShopMsg.java
# src/main/resources/mapper/TbUserShopMsgMapper.xml
|
2024-06-28 14:12:24 +08:00 |
|
|
|
ea4366362e
|
新增下单库存预警消息推送
|
2024-06-28 14:10:32 +08:00 |
|
GYJ
|
5f34a0b88d
|
redis库存和库里不一致时，更新redis
|
2024-06-28 13:37:22 +08:00 |
|
