Merge branches 'develop' and 'feature/20200102_下单返回订单类型_wuping' of…

Merge branches 'develop' and 'feature/20200102_下单返回订单类型_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -263,7 +263,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
 
         }
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<PaySuccessResp> response = orderSdkService.paySuccess(request, confirmOrderRequest.getTrackingNo());
-
+        //获取会员信息失败直接返回，非空判断
+        if(extendInfo.getData() == null){
+            return orderSdkAdapter.convent2PayAccessResponse(response);
+        }
         CalculationDiscountRequest discountRequest=activitySdkAdapter.convert2CalculationDiscountRequestDto(orderByIdResponse.getData(),extendInfo.getData());
         BaseResponse<CalculationDiscountResponseDTO> baseResponse=promotionSdkService.calculationDiscount(discountRequest,confirmOrderRequest.getTrackingNo());
         List<Integer> activityTypes=baseResponse.getData().getDiscounts().stream().map(DiscountDTO::getType).collect(Collectors.toList());