获取订单状态更新

pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/service/impl/OrderServiceImpl.java

@@ -639,7 +639,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             return null;
         }
         log.info("获取订单状态，信息：{}", order);
-        Map<String, String> map = new HashMap<>();
         // 捕获PayPal买断订单，先不判断是否支付，兼容支付回调后修改了订单状态也需要捕获一次
         if (order.getPayment() == 0 && order.getPaymentModel() == 2) {
             log.info("paypal买断订单捕获");
@@ -671,10 +670,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     if (ObjectUtils.isNotEmpty(data)) {
                         String status = data.getString("status");
                         if (StringUtils.isNotEmpty(status)) {
-                            // 成功捕获订单，直接返回
-                            log.info("捕获订单状态：{}", status);
-                            map.put("status", status);
-                            return map;
+                            // 捕获订单
+                            log.info("PayPal订单捕获：{}，状态：{}", order.getThirdOrderNo(), status);
                         }
                     }
                 } else {
@@ -685,6 +682,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
         }
         // 获取订单状态
+        Map<String, String> map = new HashMap<>();
         if (!order.getStatus().equals(2)) {
             // 未支付订单，等待2s回调
             log.info("订单等待回调，{}", orderId);