打印完善

cash-service/account-service/src/main/java/com/czg/service/account/print/PrinterHandler.java

@@ -1,5 +1,6 @@
 package com.czg.service.account.print;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
@@ -145,14 +146,6 @@ public abstract class PrinterHandler {
     }
 
     protected List<OrderDetail> getCanPrintOrderDetails(boolean partPrint, Long orderId, List<OrderDetail> tbOrderDetailList, List<?> categoryIds) {
-        List<Object> detailList = redisService.lGet(RedisCst.getPrintOrderDetailKey(orderId), 0, -1);
-        Map<Long, PrintDetailInfo> detailMap = detailList.stream().collect(Collectors.toMap(i -> {
-            if (i instanceof PrintDetailInfo i2) {
-                return i2.getDetailId();
-            }
-            throw new RuntimeException("转换orderDetail失败");
-        }, i -> (PrintDetailInfo) i));
-
         List<Long> productIds = tbOrderDetailList.stream().map(OrderDetail::getProductId).collect(Collectors.toList());
 
         Map<Long, Boolean> canPrintProMap = partPrint || categoryIds.isEmpty() ? new HashMap<>() :
@@ -161,15 +154,29 @@ public abstract class PrinterHandler {
 
         ArrayList<OrderDetail> orderDetails = new ArrayList<>();
         tbOrderDetailList.forEach(item -> {
-            PrintDetailInfo printDetailInfo = detailMap.get(item.getId());
+            Object o = redisService.get(RedisCst.getPrintOrderDetailKey(orderId, item.getId()));
-            if (item.getIsPrint() != null && item.getIsPrint() == 1 && (canPrintProMap.get(item.getProductId()) != null || !partPrint) &&
+
-                    (printDetailInfo == null || item.getNum().subtract(printDetailInfo.getPrintNum()).compareTo(BigDecimal.ZERO) > 0)) {
+            if (item.getIsPrint() != null && item.getIsPrint() == 1 && (canPrintProMap.get(item.getProductId()) != null || !partPrint)) {
                 item.setReturnNum(item.getReturnNum() == null ? BigDecimal.ZERO : item.getReturnNum());
+                PrintDetailInfo printDetailInfo = o != null ? JSONObject.parseObject((String) o, PrintDetailInfo.class) : null;
                 if (printDetailInfo != null) {
-                    item.setNum(item.getNum().subtract(printDetailInfo.getPrintNum()));
+                    if (item.getNum().compareTo(printDetailInfo.getPrintNum()) <= 0) {
-                    item.setReturnNum(item.getReturnNum().subtract(printDetailInfo.getPrintNum()));
+                        log.info("此菜品已打印, {} {} {}", item.getProductName(), item.getSkuName(), printDetailInfo);
                     }
+
+                    if (item.getReturnNum().compareTo(printDetailInfo.getPrintReturnNum()) <= 0) {
+                        log.info("此退菜菜品已打印, {} {} {}", item.getProductName(), item.getSkuName(), printDetailInfo);
+                    }
+                    item.setNum(item.getNum().subtract(printDetailInfo.getPrintNum()));
+                    item.setReturnNum(item.getReturnNum().subtract(printDetailInfo.getPrintReturnNum()));
                     orderDetails.add(item);
+                }else {
+                    orderDetails.add(item);
+                }
+
+
+            } else {
+                log.info("此菜品不在打印分类或属于免打, {} {} {}", item.getProductName(), item.getSkuName(), item.getId());
             }
         });
 
@@ -241,10 +248,8 @@ public abstract class PrinterHandler {
         }
 
         // 已打印详情信息
-        ArrayList<PrintDetailInfo> printDetailInfos = new ArrayList<>();
+        Map<Long, OrderDetail> detailMap = tbOrderDetailList.stream().map(item -> BeanUtil.copyProperties(item, OrderDetail.class)).collect(Collectors.toMap(OrderDetail::getId, i -> i));
-        Map<Long, OrderDetail> detailMap = tbOrderDetailList.stream().collect(Collectors.toMap(OrderDetail::getId, i -> i));
         tbOrderDetailList = getCanPrintOrderDetails("1".equals(machine.getClassifyPrint()), orderInfo.getId(), tbOrderDetailList, categoryIds);
-        String printKey = RedisCst.getPrintOrderDetailKey(orderInfo.getId());
         tbOrderDetailList.parallelStream().filter(o -> ObjectUtil.defaultIfNull(o.getIsPrint(), 0) == 1).forEach(item -> {
             log.info("开始打印菜品，商品名:{}", item.getProductName());
             Integer isWaitCall = ObjectUtil.defaultIfNull(item.getIsWaitCall(), 0);
@@ -291,8 +296,8 @@ public abstract class PrinterHandler {
 
             // 保存已打印信息
             OrderDetail orderDetail = detailMap.get(item.getId());
-            redisService.leftPush(printKey, new PrintDetailInfo().setPrint(item.getIsPrint() == 1).setDetailId(item.getId())
+            redisService.set(RedisCst.getPrintOrderDetailKey(orderInfo.getId(), item.getId()), JSONObject.toJSONString(new PrintDetailInfo().setPrint(item.getIsPrint() == 1).setDetailId(item.getId())
-                    .setPrintNum(orderDetail.getNum()).setPrintReturnNum(orderDetail.getReturnNum()));
+                    .setPrintNum(orderDetail.getNum()).setPrintReturnNum(orderDetail.getReturnNum())), 3600 * 24);
 
         });
 
@@ -399,6 +404,7 @@ public abstract class PrinterHandler {
 
     /**
      * 根据订单信息判断是否是退单
+     *
      * @param orderInfo 顶动感信息
      * @return 是否退款
      */