Merge branches 'feature/20210916_积分商城扣积分流程调整_wuping' and 'qa' of…

Merge branches 'feature/20210916_积分商城扣积分流程调整_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -303,6 +303,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         orderInfo.setUserId(orderBean.getUserId());
         orderInfo.setOrderPayItemCreateReqList(orderBean.getOrderPayItem());
         orderInfo.setAppId(orderBean.getAppId());
+        orderInfo.setBizType(orderBean.getBizType());
         List<OrderItemResp> orderItemList = new ArrayList<>();
         for (ProductBeanV1 productBean : orderBean.getProductList()) {
             OrderItemResp orderItemResp = new OrderItemResp();

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderServiceV1.java

@@ -3,6 +3,7 @@ package com.freemud.application.sdk.api.ordercenter.service;
 import com.freemud.application.sdk.api.ordercenter.adapter.OrderCenterSdkAdapter;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,7 +21,7 @@ public class OrderServiceV1 {
      */
     public OrderBeanV1 queryOrderById(String orderClient, String orderCode, String thirdOrderCode, Integer withOperationHistory, String trackingNo){
         QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(orderClient, orderCode, thirdOrderCode, withOperationHistory, trackingNo);
-        if(orderInfo == null){
+        if(orderInfo == null || orderInfo.getResult() == null || StringUtils.isEmpty(orderInfo.getResult().getOrderCode())){
             return null;
         }
         return orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfo.getResult());