Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java

@@ -253,12 +253,7 @@ public class DataService {
                 }
 
                 List<TbPrintMachineWithBLOBs> bloBsList = tbPrintMachineMapper.selectByShopId(tbShopInfo.getId().toString());
-
-                if (ObjectUtil.isEmpty(bloBsList) || bloBsList.size() <= 0) {
-                    log.error("此店铺没有对应的打印机设备");
-                    return Result.fail(CodeEnum.printmachinenoexsit);
-                }
-
+                if(Objects.nonNull(bloBsList)&&ObjectUtil.isNotEmpty(bloBsList)){
                     bloBsList.parallelStream().forEach(it-> {
 
                         if (!"network".equals(it.getConnectionType())) {
@@ -355,7 +350,7 @@ public class DataService {
                         String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
                         PrinterUtils.printTickets(voiceJson, 1, 1, it.getAddress(), PrinterUtils.handoverprintData(handoverInfo));
                     });
-
+                }
             }
         }
 

src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java

@@ -743,7 +743,7 @@ public class OrderService {
             } else {
                 String orderNo = generateOrderNumber();
                 TbOrderInfo orderInfo = new TbOrderInfo(orderNo, totalAmount, packAMount, totalAmount, saleAmount, totalAmount, feeAmount, "",
-                        "table", "case", userId, shopId.toString(),
+                        "table", "cash", userId, shopId.toString(),
                         "", (byte) 1, day, masterId);
                 orderInfo.setStatus("pending");
                 tbOrderInfoMapper.insert(orderInfo);