From 8eae72cefe3c45347bc5a037e03620b7445dba74 Mon Sep 17 00:00:00 2001 From: tangzh Date: Mon, 7 Apr 2025 09:06:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/printer/JiabPrintServiceImpl.java | 16 +++++++++++++++- .../impl/printer/YlyPrintServiceImpl.java | 9 --------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/printer/JiabPrintServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/printer/JiabPrintServiceImpl.java index caa555d..a1aa682 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/printer/JiabPrintServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/printer/JiabPrintServiceImpl.java @@ -1,5 +1,9 @@ package com.zbkj.service.service.impl.printer; +import cn.hutool.core.util.ObjectUtil; +import com.zbkj.common.exception.CrmebException; +import com.zbkj.common.model.order.StoreOrder; +import com.zbkj.common.vo.StoreOrderInfoOldVo; import com.zbkj.service.service.PrintService; import com.zbkj.service.service.StoreOrderInfoService; import com.zbkj.service.service.StoreOrderService; @@ -11,6 +15,7 @@ import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; /** * 佳博打印机 @@ -34,8 +39,17 @@ public class JiabPrintServiceImpl implements PrintService { } @Override - public void print(String ordId) { + public void print(String orderId) { System.out.println("1111"); + StoreOrder exitOrder = storeOrderService.getByOderId(orderId); + if (ObjectUtil.isNull(exitOrder)) { + throw new CrmebException("佳博 打印时未找到 订单信息"); + } + if (!exitOrder.getPaid()) { + throw new CrmebException("佳博 打印时出错， 订单未支付"); + } + List exitOrderInfo = storeOrderInfoService.getOrderListByOrderId(exitOrder.getId()); + // System.setProperty("jna.encoding", "GBK"); // SimpleDateFormat sdf = new SimpleDateFormat("yyyMMddHHmmss"); // diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/printer/YlyPrintServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/printer/YlyPrintServiceImpl.java index 14c5b45..ca64650 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/printer/YlyPrintServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/printer/YlyPrintServiceImpl.java @@ -50,13 +50,6 @@ public class YlyPrintServiceImpl implements PrintService { */ @Override public void print(String orderId) { -// if (ylyUtil.checkYlyPrintStatus()) { -// throw new CrmebException("易联云 未开启打印"); -// } -// // 判断是否开启自动打印 -// if (isAuto && ylyUtil.checkYlyPrintAfterPaySuccess()) { -// return; -// } StoreOrder exitOrder = storeOrderService.getByOderId(orderId); if (ObjectUtil.isNull(exitOrder)) { throw new CrmebException("易联云 打印时未找到 订单信息"); @@ -97,6 +90,4 @@ public class YlyPrintServiceImpl implements PrintService { logger.error("易联云打印小票失败 " + e.getMessage()); } } - - }