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

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/PayOrderDivisionProcessService.java

@@ -90,14 +90,10 @@ public class PayOrderDivisionProcessService {
             throw new BizException("订单不存在");
         }
 
-        // 订单不是成功状态 || 分账状态不正确
-        if(payOrder.getState() != PayOrder.STATE_SUCCESS ||
-                (
-                    payOrder.getDivisionState() != PayOrder.DIVISION_STATE_WAIT_TASK
-                 && payOrder.getDivisionState() != PayOrder.DIVISION_STATE_UNHAPPEN
-                )){
-            log.error("{}, 订单状态或分账状态不正确", logPrefix);
-            throw new BizException("订单状态或分账状态不正确");
+        // 分账状态不正确
+        if(payOrder.getDivisionState() != PayOrder.DIVISION_STATE_WAIT_TASK && payOrder.getDivisionState() != PayOrder.DIVISION_STATE_UNHAPPEN){
+            log.error("{}, 分账状态不正确", logPrefix);
+            throw new BizException("分账状态不正确");
         }
 
         //更新订单为： 分账任务处理中

jeepay-z-codegen/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.18</version>
+            <version>8.0.28</version>
         </dependency>
 
         <dependency>