Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of…

Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -3852,13 +3852,13 @@ public class OrderServiceImpl implements Orderservice {
                     throw new ServiceException(ResponseResult.ORDER_PAY_GETPRE_MESSAGE_ERROR);
                 }
                 //判断当前预支付订单是否已经支付成功
-                if (ObjectUtils.equals(TradeState.SUCCESS.getCode(), queryResponseBaseResponse.getData().getTradeState())) {
+                if (queryResponseBaseResponse.getData() != null && ObjectUtils.equals(TradeState.SUCCESS.getCode(), queryResponseBaseResponse.getData().getTradeState())) {
                     paySuccess = true;
                 }
             }
         }
 
-        if(!paySuccess){
+        if(!paySuccess && extInfo != null && StringUtils.isNotEmpty(extInfo.getFmId())){
             PaymentCloseUnifiedOrderRequest closeUnifiedOrderRequest = new PaymentCloseUnifiedOrderRequest();
             closeUnifiedOrderRequest.setFmId(extInfo.getFmId());
             closeUnifiedOrderRequest.setVer("2");