From db221e94ceb3e3b84b9180f4bedb7fa8be64f25f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Tue, 25 Jun 2024 10:01:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=B0=8F=E7=A5=A8?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/auth/LoginFilter.java | 3 +-- .../cashierservice/rabbit/RabbitConfig.java | 18 +++++++++++++ .../rabbit/RabbitConstants.java | 11 ++++++++ .../cashierservice/rabbit/RabbitProducer.java | 11 ++++++++ .../cashierservice/service/CartService.java | 26 +++++++++++++++++++ .../cashierservice/util/PrinterUtils.java | 12 ++++++--- 6 files changed, 76 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java b/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java index c2bc136..3cbf26f 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java @@ -55,8 +55,7 @@ public class LoginFilter implements Filter { "cashierService/product/productInfo", "cashierService/notify/**",//登录部分接口不校验 "notify/**", - "cashierService/table/**",//回调部分接口不校验 - "cashierService/pay/**" + "cashierService/table/**" //回调部分接口不校验 ); @Autowired diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitConfig.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitConfig.java index 2e1f20c..e4be5fb 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitConfig.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitConfig.java @@ -96,4 +96,22 @@ public class RabbitConfig { public Binding bindingPrint_Register() { return BindingBuilder.bind(queuePrint_Register()).to(printExchange_Register()).with(RabbitConstants.PRINT_MECHINE_COLLECT_ROUTINGKEY_PUT); } + + + + + @Bean + public DirectExchange consExchange_Register() { + return new DirectExchange(RabbitConstants.CONS_COLLECT_PUT); + } + + @Bean + public Queue queuecons_Register() { + return new Queue(RabbitConstants.CONS_COLLECT_QUEUE_PUT, true); //队列持久 + } + + @Bean + public Binding bindingcons_Register() { + return BindingBuilder.bind(queuePrint_Register()).to(printExchange_Register()).with(RabbitConstants.CONS_COLLECT_ROUTINGKEY_PUT); + } } \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitConstants.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitConstants.java index 1e44c86..e60473e 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitConstants.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitConstants.java @@ -38,4 +38,15 @@ public interface RabbitConstants { public static final String INTEGRAL_ROUTINGKEY_PUT = "integral_routingkey_put1"; + + + + + + public static final String CONS_COLLECT_PUT="cons_collect_put"; + + public static final String CONS_COLLECT_QUEUE_PUT = "cons_collect_queue_put"; + + + public static final String CONS_COLLECT_ROUTINGKEY_PUT = "cons_collect_routingkey_put"; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitProducer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitProducer.java index 5498148..e301c58 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitProducer.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitProducer.java @@ -42,6 +42,17 @@ public class RabbitProducer implements RabbitTemplate.ConfirmCallback { CorrelationData correlationId = new CorrelationData(UUID.randomUUID().toString()); rabbitTemplate.convertAndSend(RabbitConstants.INTEGRAL_PUT, RabbitConstants.INTEGRAL_ROUTINGKEY_PUT, content, correlationId); } + + + + + public void cons(String content){ + CorrelationData correlationId = new CorrelationData(UUID.randomUUID().toString()); + rabbitTemplate.convertAndSend(RabbitConstants.CONS_COLLECT_PUT, RabbitConstants.CONS_COLLECT_ROUTINGKEY_PUT, content, correlationId); + } + + + @Override public void confirm(CorrelationData correlationData, boolean ack, String cause) { logger.info(" 回调id:" + correlationData); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index a0d1540..866354b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -7,6 +7,7 @@ import com.chaozhanggui.system.cashierservice.dao.*; import com.chaozhanggui.system.cashierservice.entity.*; import com.chaozhanggui.system.cashierservice.exception.MsgException; import com.chaozhanggui.system.cashierservice.netty.PushToAppChannelHandlerAdapter; +import com.chaozhanggui.system.cashierservice.rabbit.RabbitProducer; import com.chaozhanggui.system.cashierservice.redis.RedisCst; import com.chaozhanggui.system.cashierservice.redis.RedisUtil; import com.chaozhanggui.system.cashierservice.util.DateUtils; @@ -54,6 +55,9 @@ public class CartService { @Autowired private TbSystemCouponsMapper systemCouponsMapper; + @Autowired + private RabbitProducer producer; + public void initCart(JSONObject jsonObject) { String tableId = jsonObject.getString("tableId"); String shopId = jsonObject.getString("shopId"); @@ -241,6 +245,15 @@ public class CartService { cashierCart.setRefundNumber(0); cashierCart.setTotalAmount(new BigDecimal(cashierCart.getTotalNumber()).multiply(productSku.getSalePrice().add(cashierCart.getPackFee()))); cashierCartMapper.insert(cashierCart); + + + //修改耗材数据 + JSONObject jsonObject=new JSONObject(); + jsonObject.put("cartId",cashierCart.getId()); + jsonObject.put("type","create"); + producer.cons(jsonObject.toString()); + + return cashierCart; } catch (Exception e) { log.error("长链接错误 addCart{}", e.getMessage()); @@ -529,6 +542,8 @@ public class CartService { public void clearCart(JSONObject jsonObject) { try { String shopId = jsonObject.getString("shopId"); + + List skuIds=new ArrayList<>(); if (redisUtil.exists(RedisCst.TABLE_CART.concat(jsonObject.getString("tableId").concat("-").concat(shopId)))) { JSONArray array = JSON.parseArray(redisUtil.getMessage(RedisCst.TABLE_CART.concat(jsonObject.getString("tableId").concat("-").concat(shopId)))); if (Objects.isNull(array) || array.isEmpty() || array.size() < 1) { @@ -536,6 +551,7 @@ public class CartService { TbCashierCart cashierCart = JSONUtil.parseJSONStr2T(array.get(i).toString(), TbCashierCart.class); redisUtil.secAdd(RedisCst.PRODUCT+shopId+":"+jsonObject.getString("skuId"),cashierCart.getNumber().toString()); productSkuMapper.updateAddStockById(jsonObject.getString("skuId"), cashierCart.getNumber()); + skuIds.add(cashierCart.getSkuId()); } } @@ -548,6 +564,16 @@ public class CartService { jsonObject1.put("type", "clearCart"); jsonObject1.put("amount", BigDecimal.ZERO); jsonObject1.put("data", new ArrayList<>()); + + + //修改耗材数据 + JSONObject jsonObject2=new JSONObject(); + jsonObject2.put("type","delete"); + jsonObject2.put("skuIds",skuIds); + jsonObject2.put("shopId",shopId); + producer.cons(jsonObject2.toString()); + + PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject1.toString(), jsonObject.getString("tableId").concat("-").concat(shopId), "", false); } catch (Exception e) { log.info("长链接错误 clearCart{}", e.getMessage()); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java index 1b00095..80f464a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java @@ -89,6 +89,7 @@ public class PrinterUtils { sb.append(""+detailPO.getMerchantName()+"

"); sb.append(""+type+"【"+detailPO.getMasterId()+"】

"); + sb.append(""+detailPO.getOutNumber()+"

"); sb.append("订单号: "+detailPO.getOrderNo()+"
"); sb.append("交易时间: "+detailPO.getTradeDate()+"
"); sb.append("收银员: "+detailPO.getOperator()+"


"); @@ -107,6 +108,11 @@ public class PrinterUtils { sb.append(""+String.format("%-"+length+"s",detail.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%8s",detail.getAmount()).replace(' ', paddingCharacter)+"
"); } + }else if(detail.getProductName().length()>10){ + + sb.append(""+detail.getProductName()+"
"); + sb.append(""+String.format("%20s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%11s",detail.getAmount()).replace(' ', paddingCharacter)+"
"); + }else { sb.append(""+String.format("%-15s",detail.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%8s",detail.getAmount()).replace(' ', paddingCharacter)+"
"); } @@ -131,9 +137,9 @@ public class PrinterUtils { sb.append("余额:"+detailPO.getBalance()+"
"); sb.append("------------------------
"); -// if(Objects.nonNull(detailPO.getOutNumber())){ -// sb.append("".concat(detailPO.getOutNumber()).concat("
")); -// } + if(Objects.nonNull(detailPO.getOutNumber())){ + sb.append("".concat(detailPO.getOutNumber()).concat("
")); + } sb.append("打印时间:"+DateUtils.getTime(new Date())+"
"); From 6fc74c9700a1e4f29623342f2b51b483753d9d77 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 27 Jun 2024 14:24:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 6 ------ src/main/resources/application-dev2.yml | 7 +------ src/main/resources/application-hph.yml | 6 ------ src/main/resources/application-prod.yml | 6 ------ src/main/resources/application-prod2.yml | 6 ------ src/main/resources/application-test.yml | 6 ------ src/main/resources/application.yml | 7 ++++++- 7 files changed, 7 insertions(+), 37 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9d7ee4d..6fe02c5 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -40,12 +40,6 @@ spring: port: 5672 username: admin password: Czg666888 -#分页配置 -pagehelper: - supportMethodsArguments: true - reasonable: true - helperDialect: mysql - params: count=countSql mybatis: configuration: diff --git a/src/main/resources/application-dev2.yml b/src/main/resources/application-dev2.yml index 73b6469..9d04027 100644 --- a/src/main/resources/application-dev2.yml +++ b/src/main/resources/application-dev2.yml @@ -37,12 +37,7 @@ spring: port: 5672 username: admin password: Czg666888 -#分页配置 -pagehelper: - supportMethodsArguments: true - reasonable: true - helperDialect: mysql - params: count=countSql + mybatis: configuration: diff --git a/src/main/resources/application-hph.yml b/src/main/resources/application-hph.yml index 4eb52e5..b675dc2 100644 --- a/src/main/resources/application-hph.yml +++ b/src/main/resources/application-hph.yml @@ -39,12 +39,6 @@ spring: port: 5672 username: admin password: Czg666888 -#分页配置 -pagehelper: - supportMethodsArguments: true - reasonable: true - helperDialect: mysql - params: count=countSql mybatis: configuration: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 5ac4ba2..843302f 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -39,12 +39,6 @@ spring: port: 5672 username: admin password: Czg666888 -#分页配置 -pagehelper: - supportMethodsArguments: true - reasonable: true - helperDialect: mysql - params: count=countSql mybatis: configuration: diff --git a/src/main/resources/application-prod2.yml b/src/main/resources/application-prod2.yml index 7c8aa90..d9c3dc4 100644 --- a/src/main/resources/application-prod2.yml +++ b/src/main/resources/application-prod2.yml @@ -39,12 +39,6 @@ spring: port: 5672 username: admin password: Czg666888 -#分页配置 -pagehelper: - supportMethodsArguments: true - reasonable: true - helperDialect: mysql - params: count=countSql mybatis: configuration: diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index e7f2d81..891e93b 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -37,12 +37,6 @@ spring: port: 5672 username: admin password: Czg666888 -#分页配置 -pagehelper: - supportMethodsArguments: true - reasonable: true - helperDialect: mysql - params: count=countSql mybatis: configuration: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ff32aef..8df3222 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -34,7 +34,12 @@ netty: parent-group-threads: 10 # 客户端的线程数 child-group-threads: 10 - +#分页配置 +pagehelper: + supportMethodsArguments: true + reasonable: false + helperDialect: mysql + params: count=countSql logging: level: # web日志