Commit Graph

225 Commits

Author SHA1 Message Date
GYJ
89af38dc15 Merge branch 'refs/heads/dev' into gyj 2024-07-10 15:49:38 +08:00
韩鹏辉
288a8b76be 修改 2024-07-10 15:10:21 +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
韩鹏辉
ce0a019a80 Merge remote-tracking branch 'origin/dev' into dev 2024-06-28 10:27:46 +08:00
韩鹏辉
0b4c658f7c 添加耗材 2024-06-28 10:27:34 +08:00
7124b8a345 sql问题 2024-06-28 10:07:19 +08:00
韩鹏辉
05c88e00d3 Merge branch 'dev' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into dev 2024-06-28 09:59:50 +08:00
韩鹏辉
1c776b8d5e 添加耗材 2024-06-28 09:59:16 +08:00
韩鹏辉
58ad37b845 添加耗材 2024-06-28 09:59:06 +08:00
6fc74c9700 统一分页配置 2024-06-27 14:24:22 +08:00
a1894d0953 Merge branch 'lyf' 2024-06-26 09:35:50 +08:00
韩鹏辉
feef3b80ed 修改打印问题 2024-06-26 09:34:16 +08:00
韩鹏辉
566272ad67 去除小票打印二维码 2024-06-26 09:34:16 +08:00
GYJ
b431937e49 Merge branch 'refs/heads/1.0.1' into dev 2024-06-26 09:33:29 +08:00
GYJ
c63ce25e24 Merge branch 'refs/heads/stock-share' into dev 2024-06-26 09:16:26 +08:00
韩鹏辉
4c8cbe7c20 修改打印问题 2024-06-25 14:57:34 +08:00
4caf080397 扣除库存调整 2024-06-25 11:08:55 +08:00