Commit Graph

499 Commits

Author SHA1 Message Date
韩鹏辉 c353e03dbf 修改耗材提醒 2024-07-09 15:53:14 +08:00
韩鹏辉 65fe019b9e 修改会员退款逻辑 2024-07-09 14:06:41 +08:00
GYJ 6b230eaa1b 小票打印二维码 2024-07-06 20:21:48 +08:00
GYJ 52921d88f6 Merge branch 'refs/heads/zs' into dev 2024-07-06 20:20:58 +08:00
GYJ 7daa596d31 Merge branch 'refs/heads/hph' into dev 2024-07-06 20:20:33 +08:00
SongZhang 8f5ee47c19 创建订单发送库存预警 2024-07-06 16:40:49 +08:00
SongZhang dcec5e01f3 创建订单发送库存预警 2024-07-06 16:38:45 +08:00
韩鹏辉 08197e7a20 修改会员退单金额错误 2024-07-06 16:31:01 +08:00
韩鹏辉 7efa1f3f3b 修改会员退单金额错误 2024-07-06 16:29:40 +08:00
韩鹏辉 14dd00e732 Merge remote-tracking branch 'origin/hph' 2024-07-06 14:35:45 +08:00
韩鹏辉 ee20f1244b 修改会员退单金额错误 2024-07-06 14:35:13 +08:00
韩鹏辉 d3c8360168 Merge remote-tracking branch 'origin/dev' 2024-07-06 10:25:41 +08:00
韩鹏辉 1287f103df 去除小票打印二维码 2024-07-06 10:18:13 +08:00
GYJ eb4bc4ecfd Merge branch 'refs/heads/dev' 2024-07-06 09:28:35 +08:00
SongZhang b1199d80ae Merge remote-tracking branch 'origin/dev' into dev 2024-07-05 17:44:50 +08:00
SongZhang 7e911d37b8 Merge remote-tracking branch 'origin/hph' into dev
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
2024-07-05 17:44:38 +08:00
SongZhang b3a17aa9d7 清空购物车返还耗材 2024-07-05 17:15:52 +08:00
GYJ bfbeda25df Merge branch 'refs/heads/dev' 2024-07-05 16:42:05 +08:00
GYJ f3e7eaa832 Merge branch 'refs/heads/hph' into dev 2024-07-05 16:41:47 +08:00
韩鹏辉 d32f868397 Merge remote-tracking branch 'origin/hph' 2024-07-05 16:37:45 +08:00
韩鹏辉 b9fd6aed7a 修改耗材 2024-07-05 16:37:02 +08:00
韩鹏辉 cbb0276958 Merge remote-tracking branch 'origin/hph' 2024-07-05 16:01:00 +08:00
韩鹏辉 c8ebe7fcfb 修改耗材 2024-07-05 16:00:27 +08:00
SongZhang 314df236f1 清空购物车返还库存 2024-07-05 14:34:32 +08:00
韩鹏辉 33a9b969d0 Merge remote-tracking branch 'origin/dev' into hph 2024-07-05 14:31:18 +08:00
SongZhang f572c3de88 清空购物车返还库存 2024-07-05 14:30:44 +08:00
SongZhang 6ef9a10639 Merge remote-tracking branch 'origin/hph' into dev 2024-07-05 14:22:42 +08:00
韩鹏辉 4d526525a5 添加耗材警告 2024-07-05 14:22:21 +08:00
SongZhang cae6555d87 清空购物车返还库存 2024-07-05 14:19:55 +08:00
SongZhang 109b047a88 清空购物车返还库存 2024-07-05 14:11:58 +08:00
SongZhang e0359be0dc 下单扣取库存 2024-07-05 11:35:11 +08:00
韩鹏辉 d772c63ee5 添加耗材警告 2024-07-05 10:20:09 +08:00
wangw 2b086ef923 日志输出为 cashier-client.log
10MB 进行一次存储
2024-07-05 09:58:52 +08:00
SongZhang 47e176b45a 下单扣取库存 2024-07-04 17:00:33 +08:00
SongZhang b02f92c54f 下单扣取库存 2024-07-04 09:33:44 +08:00
GYJ 8dfd31c58c 退单 库存记录 sku 没有productId的问题 2024-07-03 17:35:11 +08:00
GYJ e54a236dab 库存记录单位不正确 2024-07-03 15:48:30 +08:00
韩鹏辉 781a4baa81 添加耗材警告 2024-07-03 14:52:25 +08:00
韩鹏辉 f7b44edf0d 添加耗材警告 2024-07-03 14:51:55 +08:00
SongZhang 8da3d036b1 下单扣取库存 2024-07-03 10:57:40 +08:00
SongZhang e31f3c831a 库存预警支持多账号订阅 2024-07-02 16:13:24 +08:00
GYJ d35a5f2cc0 退单增加库存记录 2024-07-02 11:15:55 +08:00
GYJ 5a8af7f0bb 添加isDistribute注释 2024-07-02 10:13:34 +08:00
GYJ 286b9af051 mapper参数写错 2024-06-29 09:30:28 +08:00
韩鹏辉 8f4afed929 Merge remote-tracking branch 'origin/dev' into dev 2024-06-28 18:00:00 +08:00
韩鹏辉 4e27eb87b5 修改耗材库存 2024-06-28 17:59:41 +08:00
GYJ 5a61e994a1 下单根据是否共享库存判断商品和sku库存 2024-06-28 14:57:46 +08:00
SongZhang d82387e9d1 新增下单库存预警消息推送 2024-06-28 14:15:42 +08:00
韩鹏辉 fad761b63c 修改耗材库存 2024-06-28 09:39:29 +08:00
韩鹏辉 75ec8fc9e5 修改耗材库存 2024-06-28 09:39:14 +08:00