Explorar el Código

修复order转账状态问题

skyfffire hace 1 mes
padre
commit
b63ff6f87a

+ 7 - 8
src/main/java/modules/order/OrderService.java

@@ -344,16 +344,15 @@ public class OrderService {
         
         // 未给用户转账的进行转账
         for (Order order : orderList) {
+            // 已经交付完成或交付失败就不用看状态了
+            if (order.getOrderStatus() == OrderController.OrderStatus.COMPLETED.code
+                    || order.getOrderStatus() == OrderController.OrderStatus.CANCELED.code
+                    || order.getOrderStatus() == OrderController.OrderStatus.REFUNDED.code) {
+                continue;
+            }
+            
             // 已经执行过转账的查看是否确权,查看状态
             if (StrKit.notBlank(order.getBsnTransferCode())) {
-                // 已经交付完成或交付失败就不用看状态了
-                if (order.getOrderStatus() == OrderController.OrderStatus.COMPLETED.code
-                        || order.getOrderStatus() == OrderController.OrderStatus.CANCELED.code
-                        || order.getOrderStatus() == OrderController.OrderStatus.REFUNDED.code) {
-                    continue;
-                }
-
-                // 其它的再考虑看状态
                 try {
                     JSONObject searchResponse = BsnSDK.search(order.getBsnTransferCode());
 

+ 2 - 2
src/test/rest/OrderControllerTest.http

@@ -8,7 +8,7 @@ Content-Type: application/json
 dl-token: {{dl_token_var}}
 
 {
-  "nftt_id": 2
+  "nftt_id": 10000
 }
 
 ### 用户取消订单
@@ -17,7 +17,7 @@ Content-Type: application/json
 dl-token: {{dl_token_var}}
 
 {
-  "order_id": 3
+  "order_id": 6
 }
 
 ### 用户根据订单号查找订单