Merge branch 'zx_online_update_1218' into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -488,12 +488,11 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
 
                                 // 更新订单退款异常信息
                                 userPaymentOrderService.updateById(order);
-                                if (closeFlag) {
-                                    closeWaitOrder(paymentOrder);
-                                }
-
                             });
-                            throw new BizException("查询交易中，请耐心等待!");
+                            if (!closeFlag) {
+                                // 重新查询订单状态
+                                throw new BizException("查询交易中，请耐心等待!");
+                            }
                         }
                     }
                 } catch (Exception e) {