Java21

src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java

@@ -235,7 +235,7 @@ public class PrinterServiceImpl implements PrinterService {
             if (printerList.size() != 1) {
                 throw new BaseException("请选择打印机");
             } else {
-                printerId = printerList.get(0).getId();
+                printerId = printerList.getFirst().getId();
             }
         } else {
             PrinterEntity printer = printerMapper.getById(printerId);
@@ -293,7 +293,6 @@ public class PrinterServiceImpl implements PrinterService {
         if (order.getPayPrice().equals(BigDecimal.ZERO)) {
             orderBiz.paidOrder(order.getId());
             data.put("needPay", false);
-            return data;
         } else {
             WXPayOrderReqVO wxPayOrderReqVO = new WXPayOrderReqVO();
             wxPayOrderReqVO.setOpenId(order.getOpenId())
@@ -308,8 +307,8 @@ public class PrinterServiceImpl implements PrinterService {
                 throw new BaseException(e);
             }
             data.put("orderId", orderId);
-            return data;
         }
+        return data;
     }
 
     @Override