Commit Graph

257 Commits

Author SHA1 Message Date
韩鹏辉 b236cac065 添加耗材 2024-07-05 10:05:57 +08:00
wangw 6908d8eaf3 日志文件 50MB 进行一次打包 2024-07-05 09:51:42 +08:00
SongZhang 3ea12c88fe 加入购物车校验库存 2024-07-05 09:12:09 +08:00
SongZhang c88b085a4e 未开启库存不校验库存数量 2024-07-04 16:40:33 +08:00
GYJ 435c81a4f4 Merge branch 'refs/heads/dev' 2024-07-04 09:32:14 +08:00
SongZhang f041c983a5 创建订单扣除库存 2024-07-04 09:09:07 +08:00
wangw 376134fc19 shopUser增加 店铺名称字段 2024-07-03 16:29:11 +08:00
SongZhang 09bfa5bdec 创建订单扣除库存 2024-07-03 10:12:06 +08:00
SongZhang dfdeca9612 下单发送create消息,处理耗材 2024-07-02 16:37:14 +08:00
SongZhang 57160c66c5 库存预警支持多用户提醒 2024-07-02 15:19:40 +08:00
wangw ac3ef8d8d3 购物车不操作库存/耗材 2024-07-02 11:40:50 +08:00
SongZhang 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
SongZhang 7e00911def 新增下单库存预警消息推送 2024-06-28 14:13:41 +08:00
SongZhang 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
SongZhang 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
wangw 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
wangw 6fc74c9700 统一分页配置 2024-06-27 14:24:22 +08:00
wangw 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
SongZhang 4caf080397 扣除库存调整 2024-06-25 11:08:55 +08:00
韩鹏辉 db221e94ce 去除小票打印二维码 2024-06-25 10:01:45 +08:00
GYJ daf454359f 加入购物车扣除库存逻辑修改 2024-06-24 15:37:05 +08:00
GYJ c24434b121 加入购物车扣除库存逻辑修改 2024-06-24 15:12:39 +08:00
GYJ 487a9e7b6b 添加字段 2024-06-24 11:59:07 +08:00
韩鹏辉 bdf9a2c89f 去除小票打印二维码 2024-06-22 13:42:29 +08:00
wangw d86463155d 登录部分 2024-06-22 11:26:07 +08:00
wangw 941c33ea7a 登录问题 2024-06-22 09:34:16 +08:00
韩鹏辉 14b75d982d Merge branch 'lyf' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into lyf 2024-06-21 13:57:10 +08:00
韩鹏辉 4567c8ab4a 去除小票打印二维码 2024-06-21 13:56:43 +08:00
wangw 94f769e091 更换手机号时 会员关系 解除 2024-06-21 11:17:29 +08:00
wangw 4a4c5623aa client 标签打印 长链接
会员绑定
2024-06-21 09:18:56 +08:00
韩鹏辉 4d7e6c3650 添加打印机取餐码 2024-06-19 16:40:13 +08:00
韩鹏辉 117fd0dbd2 Merge branch 'lyf' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into lyf
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/CartService1.java
2024-06-19 15:10:56 +08:00
韩鹏辉 c0cad47e51 添加打印机取餐码 2024-06-19 15:10:22 +08:00
wangw 04c5f783bd 无效代码移除
购物车 规格字段
2024-06-19 15:06:46 +08:00
韩鹏辉 10432eceb9 Merge branch 'lyf' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into lyf
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
2024-06-19 09:59:34 +08:00
韩鹏辉 e2b22116a0 添加取餐码功能 2024-06-19 09:55:00 +08:00
wangw 3d6bf6a0ae 支付密码 2024-06-17 17:51:04 +08:00