苹果支付超时设置为退款中

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

@@ -592,9 +592,6 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
             LocalDateTime now = LocalDateTime.now();
             if (Objects.equals(orderVo.getStatus(), GoblinStatusConst.NftStatus.ORDER_STATUS_3.getValue())) {// 超时支付
                 log.info("Nft订单超时支付 param:[orderCode:{}]", orderCode);
-                if (syncOrderParam.getPaymentType().equals("APPLE_PAY")) { // 苹果支付不做处理
-                    return "success";
-                }
                 // 处理为退款中
                 orderVo.setStatus(GoblinStatusConst.NftStatus.ORDER_STATUS_4.getValue());
                 orderVo.setUpdatedAt(now);
@@ -610,8 +607,12 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                 // mysql
                 queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_NFT_ORDER.getKey(),
                         SqlMapping.gets(sqls, sqlDataOrder));
-                // 退款
-                nftOrderUtils.refundOrderSku(orderId, syncOrderParam.getPaymentId(), syncOrderParam.getPaymentType());
+
+                if (syncOrderParam.getPaymentType().equals("APPLE_PAY")) {// 苹果支付不做处理
+                    return "success";
+                } else {// 退款
+                    nftOrderUtils.refundOrderSku(orderId, syncOrderParam.getPaymentId(), syncOrderParam.getPaymentType());
+                }
             } else {// 正常流程
                 orderVo.setPaymentType(syncOrderParam.getPaymentType());
                 orderVo.setPaymentId(syncOrderParam.getPaymentId());