Merge remote-tracking branch 'origin/master'

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

@@ -238,7 +238,7 @@ public abstract class PrinterHandler {
         // 判断订单是否是先付费或者已结算
         if (!"after-pay".equals(orderInfo.getPayMode()) && (OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus()) || OrderStatusEnums.CANCELLED.getCode().equals(orderInfo.getStatus()))) {
             log.warn("此订单未支付, 订单信息: {}", orderInfo);
-            return;
+//            return;
         }
 
         List<?> categoryIds = JSONObject.parseObject(StrUtil.emptyToDefault(machine.getCategoryIds(), "[]"), List.class);

cash-service/pom.xml

@@ -93,7 +93,11 @@
             <artifactId>mysql-connector-j</artifactId>
         </dependency>
 
-
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>8.0.2.Final</version>
+        </dependency>
 
     </dependencies>
 </project>