Commit Graph

110 Commits

Author SHA1 Message Date
1e66c99606 购物车加入bug fix 2024-08-22 10:37:15 +08:00
1a968775ff 商品列表角标 2024-08-22 09:56:19 +08:00
0e2c0a9604 1.代客下单会员余额支付 2024-08-21 17:45:16 +08:00
fbea2c6670 1.代客下单先付款后付款操作 2024-08-21 14:56:08 +08:00
b7708d82e1 1.代客下单后选择会员修改 2024-08-21 10:23:24 +08:00
e04c3ee084 1.增加台桌会员id 2024-08-21 09:49:24 +08:00
eb424d8eb4 Merge remote-tracking branch 'origin/test' into dkxd2
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
2024-08-21 09:11:59 +08:00
牛叉闪闪
af3ea12121 Merge remote-tracking branch 'origin/hph' into test 2024-08-20 17:18:26 +08:00
牛叉闪闪
653254f9f3 添加员工折扣 2024-08-20 17:17:55 +08:00
d8027c92b2 1.增加mybatisplus依赖 2024-08-20 17:03:51 +08:00
46133d7d16 1.查询商品返回规格上下架信息字段 2024-08-19 14:35:55 +08:00
61157d730c 1.耗材check值错误修复 2024-08-17 15:00:46 +08:00
38b03b556c 1.推送校验耗材是否开启check 2024-08-16 13:51:06 +08:00
5a0112132d Merge remote-tracking branch 'origin/dev' into zs
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
2024-08-14 14:11:53 +08:00
牛叉闪闪
4a0a548565 加入购物车添加耗材控制 2024-08-14 11:35:39 +08:00
148440cb31 1.无法修改库存fix 2024-08-13 14:33:12 +08:00
22eadf7193 1.推送增加店铺开关校验 2024-08-12 14:35:27 +08:00
86df7addd6 1.代客下单相关接口 2024-08-09 16:07:00 +08:00
牛叉闪闪
6359f9b466 修改退单sku 2024-08-02 15:48:56 +08:00
cc5fea21e8 员工登录 重复账号问题 2024-08-02 09:26:52 +08:00
e617e08923 订单备注 2024-08-01 11:15:50 +08:00
牛叉闪闪
cf316508de 添加订单备注 2024-07-29 16:00:50 +08:00
牛叉闪闪
728e87f90b 添加订单备注 2024-07-29 16:00:06 +08:00
牛叉闪闪
03b8dff85b 添加订单备注 2024-07-29 10:51:11 +08:00
牛叉闪闪
1bf12d880c 添加打印日志 2024-07-25 15:49:44 +08:00
牛叉闪闪
37e9745ca7 添加打印日志 2024-07-25 11:26:19 +08:00
6c885ab5a1 1.库存预警推送更改未公众号推送 2024-07-25 10:40:09 +08:00
牛叉闪闪
1ea0eea537 添加交班时间 2024-07-22 14:12:12 +08:00
牛叉闪闪
539129781a 根据订单id获取订单详情 2024-07-18 17:25:23 +08:00
b27b364848 1.线下退单
2.销售同步保存库存记录
2024-07-17 16:43:11 +08:00
牛叉闪闪
56d66097c7 耗材流水中添加订单信息 2024-07-17 11:19:45 +08:00
牛叉闪闪
35057b4ee7 Merge branch 'dev' into hph 2024-07-17 11:11:11 +08:00
34e3cb9cb0 查询订单增加时间参数 2024-07-16 14:20:06 +08:00
牛叉闪闪
d042b14c6a 修改耗材消耗 2024-07-15 11:05:22 +08:00
韩鹏辉
d72af13b2c Merge remote-tracking branch 'origin/hph' into dev 2024-07-11 13:51:56 +08:00
韩鹏辉
6e7ee2137b 添加现金充值操作密码 2024-07-11 13:51:22 +08:00
4691b12fb3 下单增加起售校验 2024-07-11 11:45:18 +08:00
61fe12c087 sku 新增逻辑删除字段 和 起售值 2024-07-11 10:12:44 +08:00
韩鹏辉
b9fd6aed7a 修改耗材 2024-07-05 16:37:02 +08:00
韩鹏辉
c8ebe7fcfb 修改耗材 2024-07-05 16:00:27 +08:00
韩鹏辉
33a9b969d0 Merge remote-tracking branch 'origin/dev' into hph 2024-07-05 14:31:18 +08:00
韩鹏辉
4d526525a5 添加耗材警告 2024-07-05 14:22:21 +08:00
韩鹏辉
d772c63ee5 添加耗材警告 2024-07-05 10:20:09 +08:00
2b086ef923 日志输出为 cashier-client.log
10MB 进行一次存储
2024-07-05 09:58:52 +08:00
韩鹏辉
781a4baa81 添加耗材警告 2024-07-03 14:52:25 +08:00
e31f3c831a 库存预警支持多账号订阅 2024-07-02 16:13:24 +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
d82387e9d1 新增下单库存预警消息推送 2024-06-28 14:15:42 +08:00