Merge branches 'feature/20210917_订单数据为空判断修复_wuping' and 'qa' of…

Merge branches 'feature/20210917_订单数据为空判断修复_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/manager/OrderManager.java

@@ -7,6 +7,7 @@ import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCod
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.sdk.api.assortment.order.request.order.BaseQueryOrderRequest;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -28,7 +29,7 @@ public class OrderManager {
             queryOrderByIdResponse.setErrcode(Integer.parseInt(orderInfo.getCode()));
             queryOrderByIdResponse.setErrmsg(orderInfo.getMessage());
         }
-        if(orderInfo != null && orderInfo.getResult() != null){
+        if(orderInfo != null && orderInfo.getResult() != null && StringUtils.isNotEmpty(orderInfo.getResult().getOrderCode())){
             OrderBeanV1 orderBeanV1 = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfo.getResult());
             queryOrderByIdResponse.setData(orderBeanV1);
         }