Commit Graph

164 Commits

Author SHA1 Message Date
韩鹏辉
a7206b4506 只允许一个登录 2024-07-13 17:38:20 +08:00
牛叉闪闪
0a0d009b2c 添加会员充值密码 2024-07-13 15:09:38 +08:00
牛叉闪闪
944b1102e5 只允许一个登录 2024-07-12 17:29:01 +08:00
GYJ
5963f18425 Merge branch 'refs/heads/dev' 2024-07-12 14:32:42 +08:00
GYJ
2a28151139 退款暂不校验密码 2024-07-12 10:23:01 +08:00
韩鹏辉
81158431c8 退款操作密码 2024-07-11 14:23:59 +08:00
韩鹏辉
63ae10c971 退款操作密码 2024-07-11 14:23:24 +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
ef73fe192a 下单增加起售校验 2024-07-11 13:48:12 +08:00
4691b12fb3 下单增加起售校验 2024-07-11 11:45:18 +08:00
2818f8afff Merge remote-tracking branch 'origin/hph' into dev 2024-07-11 11:33:39 +08:00
61fe12c087 sku 新增逻辑删除字段 和 起售值 2024-07-11 10:12:44 +08:00
韩鹏辉
007a7a47a7 修改耗材提醒 2024-07-10 09:09:06 +08:00
韩鹏辉
707f846af0 修改耗材提醒 2024-07-09 16:44:56 +08:00
韩鹏辉
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
8f5ee47c19 创建订单发送库存预警 2024-07-06 16:40:49 +08:00
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
b1199d80ae Merge remote-tracking branch 'origin/dev' into dev 2024-07-05 17:44:50 +08:00
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
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
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
f572c3de88 清空购物车返还库存 2024-07-05 14:30:44 +08:00
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
cae6555d87 清空购物车返还库存 2024-07-05 14:19:55 +08:00
109b047a88 清空购物车返还库存 2024-07-05 14:11:58 +08:00
e0359be0dc 下单扣取库存 2024-07-05 11:35:11 +08:00
韩鹏辉
d772c63ee5 添加耗材警告 2024-07-05 10:20:09 +08:00
2b086ef923 日志输出为 cashier-client.log
10MB 进行一次存储
2024-07-05 09:58:52 +08:00
47e176b45a 下单扣取库存 2024-07-04 17:00:33 +08:00
b02f92c54f 下单扣取库存 2024-07-04 09:33:44 +08:00