fix pay time out

chenchao
Commit ae6facb94fed959e5fecb6ed44cdd7b99a5d1e37 1 parent 376fc723
Showing 1 changed file with 4 additions and 2 deletions
order/src/main/java/com/yohoufo/order/service/seller/deposit/SellerDepositOrderService.java
--- a/order/src/main/java/com/yohoufo/order/service/seller/deposit/SellerDepositOrderService.java
View file @ae6facb
+++ b/order/src/main/java/com/yohoufo/order/service/seller/deposit/SellerDepositOrderService.java
View file @ae6facb
@@ -260,18 +260,20 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
         switch (appraiseOrderStatus){
             case WAITING_PAY:
                 Payment payment = Payment.getPayment(pao.getPayment());
+                if (Objects.nonNull(payment)) {
                     AbstractPayService payService = paymentService.getPayService(payment.getCode());
                     PayQueryBo payQueryBo = payService.payQuery(String.valueOf(orderCode), pao.getCreateTime());
-                if (payQueryBo != null && payQueryBo.isPayStatus()){
+                    if (payQueryBo != null && payQueryBo.isPayStatus()) {
                         logger.info("seller deposit order auto cancel failed, confirm paid. uid is {}, orderCode is {}", uid, orderCode);
                         PayConfirmEvent event = new PayConfirmEvent(uid, orderCode, pao.getPayment());
                         EventBusPublisher.publishEvent(event);
                     }
                     // 如果近1分钟有预支付记录，则发送 自动取消延迟消息
-                if ( !orderCancelEvent.isFinalRetry()){
+                    if (!orderCancelEvent.isFinalRetry()) {
                         paymentService.checkPrePay(uid, orderCode);
                     }
+                }
                 rows = super.triggerStatusChange(orderCode, AppraiseOrderStatus.CANCEL_TIMEOUT, appraiseOrderStatus);
                 break;
             default: