Commit Graph

276 Commits

Author SHA1 Message Date
GYJ a6adc81366 退款回滚库存 2024-06-19 17:36:45 +08:00
韩鹏辉 d46d4ca6df 修改库存 2024-06-19 17:27:38 +08:00
韩鹏辉 5b97722699 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/annotation/LimitSubmit.java
#	src/main/java/com/chaozhanggui/system/cashierservice/interceptor/LimitSubmitAspect.java
#	src/main/java/com/chaozhanggui/system/cashierservice/interceptor/WebAppConfigurer.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
#	src/main/java/com/chaozhanggui/system/cashierservice/util/RedisConfig.java
#	src/main/java/com/chaozhanggui/system/cashierservice/util/RedisUtils.java
#	src/main/resources/generator-mapper/generatorConfig.xml
2024-06-19 16:46:27 +08:00
韩鹏辉 50fa846cf1 修改库存 2024-06-19 16:44:11 +08:00
韩鹏辉 90a8fd4a54 添加类型 2024-06-14 15:28:13 +08:00
韩鹏辉 e5f5317f4e 修改库存 2024-06-12 11:57:55 +08:00
韩鹏辉 e109b31ff2 修改库存 2024-06-12 10:14:05 +08:00
韩鹏辉 c50172f5ca 修改库存 2024-06-12 10:12:58 +08:00
韩鹏辉 a1764e77c6 修改库存 2024-06-12 10:03:09 +08:00
韩鹏辉 7e8a86db6f Merge branch 'master' of https://e.coding.net/g-cphe0354/shouyinjixitong/cashier-client 2024-06-04 16:03:50 +08:00
韩鹏辉 ee3efaff6a 修改会员添加报错 2024-06-04 16:03:39 +08:00
wangw 21008fd918 会员新建关联
会员支付金额校验
团购卷退款订单号
2024-06-04 09:15:42 +08:00
韩鹏辉 70b29bd3ff 修改会员添加报错 2024-05-31 15:16:24 +08:00
韩鹏辉 689db4cf1b 修改交班数据 2024-05-30 16:51:49 +08:00
韩鹏辉 92df7d1ba6 修改交班数据 2024-05-30 11:21:05 +08:00
韩鹏辉 29293fd093 修改交班数据 2024-05-30 09:17:43 +08:00
韩鹏辉 9482cf4597 修改交班数据 2024-05-29 16:00:12 +08:00
韩鹏辉 664e57e145 添加会员充值奖励 2024-05-29 10:38:36 +08:00
wangw 640036afc5 退款回调 2024-05-24 15:58:28 +08:00
wangw 3e6cb81b46 购物车 多规格商品返回规格信息
团购卷列表
团购卷退款
员工登录管理
2024-05-24 15:56:41 +08:00
韩鹏辉 c5e337bef3 修改支付 2024-05-20 17:44:19 +08:00
韩鹏辉 cd913643a5 添加快捷支付 2024-05-20 09:59:15 +08:00
wangguocheng 776e9076da 商品查询修改 2024-05-17 10:56:55 +08:00
韩鹏辉 9b441ba636 添加新版收银系统支付 2024-05-17 10:52:22 +08:00
韩鹏辉 e64bce5e93 添加新版收银系统支付 2024-05-17 10:51:30 +08:00
wangguocheng 09e9b172ee 商品查询修改 2024-05-17 10:48:36 +08:00
wangguocheng 168d9c8a43 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/resources/generator-mapper/generatorConfig.xml
2024-05-17 10:31:29 +08:00
wangguocheng 1c6ccb7d10 商品查询修改 2024-05-17 10:28:43 +08:00
韩鹏辉 bdce57ca44 添加新版收银系统支付 2024-05-16 14:21:55 +08:00
韩鹏辉 7b259ba55f 添加退单打印 2024-04-17 13:49:14 +08:00
韩鹏辉 9f8fbe4850 修改支付通道问题 2024-04-16 11:19:17 +08:00
韩鹏辉 c0f3b445cb 修改打印数据 2024-04-15 15:33:18 +08:00
19991905653 a2432316ea 交班打印逻辑修改 2024-04-12 10:27:51 +08:00
19991905653 c3c169d2b5 交班修改业务逻辑 ,跨天统计 2024-04-11 15:21:52 +08:00
19991905653 49ed813f63 客户端增加扣减库存 2024-04-09 17:24:44 +08:00
韩鹏辉 bc4c3e6975 修改飞蛾小票打印 2024-04-08 12:00:23 +08:00
wangw 55c0b270a0 打印机 contentType固定local 2024-04-07 11:21:34 +08:00
wangw 78fc29fb0f 入参注释 2024-04-07 09:00:44 +08:00
19991905653 4ac4efae96 Merge branch 'master' of https://e.coding.net/g-cphe0354/shouyinjixitong/cashier-client 2024-04-03 17:36:37 +08:00
19991905653 a925ae6538 更新全选打包 2024-04-03 17:36:31 +08:00
19991905653 e18d620000 更新全选打包 2024-04-03 17:34:04 +08:00
韩鹏辉 6ec91caa9a 添加结算打印小票 2024-04-03 17:34:03 +08:00
19991905653 d98de3cfee 更新全选打包 2024-04-03 17:32:49 +08:00
wangw 39a5096151 PC打印机根据打印机类型 获取列表 2024-04-03 15:48:52 +08:00
19991905653 baedf85e77 更新全选打包 2024-04-03 15:39:24 +08:00
19991905653 95e68d745e Merge branch 'master' of https://e.coding.net/g-cphe0354/shouyinjixitong/cashier-client 2024-04-03 14:34:51 +08:00
19991905653 9627c59582 修改交班落地数据逻辑 2024-04-03 14:34:42 +08:00
韩鹏辉 ee84c4655e Merge remote-tracking branch 'origin/master' 2024-04-03 14:20:49 +08:00
韩鹏辉 9b518d8426 添加结算打印小票 2024-04-03 14:20:39 +08:00
wangw 3f95f15775 PC打印机列表 2024-04-03 11:40:25 +08:00