打印样式修改

src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintConsumer.java

@@ -155,6 +155,10 @@ public class PrintConsumer {
             wrapper.like(TbPrintMachine::getPrintType, printType);
         }
         List<TbPrintMachine> list = mpPrintMachineMapper.selectList(wrapper);
+        for (TbPrintMachine item : list) {
+            //实际打印以传递的参数为准
+            item.setPrintMethod(printMethod);
+        }
         if (list.isEmpty()) {
             log.error("店铺未配置打印机，店铺id: {}", shopId);
             return list;

src/main/java/com/chaozhanggui/system/cashierservice/service/impl/ShopPrintLogServiceImpl.java

@@ -153,7 +153,7 @@ public class ShopPrintLogServiceImpl extends ServiceImpl<TbPrintMachineLogMapper
         // 云想印
         if ("yxyPrinter".equals(config.getContentType())) {
             // 延迟3ms，复查打印状态 (用户可以根据设备信息查询到当前设备的在线情况（注：该接口只能提供参考，设备的离线状态是在设备离线3分钟后才会生效）)
-            ThreadUtil.safeSleep(1000*3);
+            ThreadUtil.safeSleep(1000 * 5);
             String jsonStr = PrinterUtils.checkPrintStatus(config.getAddress(), entity.getTaskId());
             cn.hutool.json.JSONObject resp = JSONUtil.parseObj(jsonStr);
             int code = resp.getInt("code");
@@ -186,7 +186,7 @@ public class ShopPrintLogServiceImpl extends ServiceImpl<TbPrintMachineLogMapper
             }
             // 飞鹅云打印机
         } else if ("fePrinter".equals(config.getContentType())) {
-            ThreadUtil.safeSleep(1000*3);
+            ThreadUtil.safeSleep(1000 * 5);
             Boolean success = FeieyunPrintUtil.checkPrintStatus(entity.getTaskId());
             if (success == null) {
                 entity.setFailFlag(1);
@@ -197,10 +197,16 @@ public class ShopPrintLogServiceImpl extends ServiceImpl<TbPrintMachineLogMapper
                 entity.setRespMsg("打印成功");
             } else {
                 String msg = FeieyunPrintUtil.checkOnline(entity.getAddress());
+                if (msg.indexOf("在线") > 0) {
+                    entity.setFailFlag(0);
+                    entity.setPrintTime(new Date());
+                    entity.setRespMsg("打印成功");
+                } else {
                     entity.setFailFlag(1);
                     entity.setPrintTime(null);
                     entity.setRespMsg(StrUtil.concat(true, "打印失败，", "_", msg));
                 }
+            }
             super.updateById(entity);
         }
     }