qa和master代码合并

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

 package cn.freemud.management.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.management.adapter.DeliverySdkAdapter;
 import cn.freemud.management.entities.dto.request.console.BizDTO;
 import cn.freemud.management.entities.dto.request.console.ConsoleResponseDTO;
 import cn.freemud.management.entities.dto.request.console.GetStoreMixRequest;
 import cn.freemud.management.entities.dto.request.console.QueryFlag;
-import cn.freemud.base.log.LogTreadLocal;
-import cn.freemud.base.util.JsonUtil;
-import cn.freemud.management.adapter.DeliverySdkAdapter;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
-import cn.freemud.management.enums.DeliveryStatus;
-import cn.freemud.management.enums.CreateEventEnum;
-import cn.freemud.management.enums.OperateType;
-import cn.freemud.management.enums.RefundStatus;
-import cn.freemud.management.enums.ResponseResult;
+import cn.freemud.management.enums.*;
 import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.management.service.OrderManagerService;
@@ -41,7 +35,6 @@ import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
 import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
 import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
 import com.freemud.sdk.api.assortment.order.enums.PayType;
-import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -390,9 +383,15 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
     @Override
     public BaseResponse<OrderManagerResponse> orderRecreateDelivery(OrderManagerRequest request, OrderBeanV1 orderBean) {
         // 查询门店信息
-        StoreResponse storeInfo = storeCenterService.getStoreInfo(new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId()), LogTreadLocal.getTrackingNo());
-
-        return deliveryHandle.createDelivery(orderBean,request,storeInfo);
+//        StoreResponse storeInfo = storeCenterService.getStoreInfo(new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId()), LogTreadLocal.getTrackingNo());
+        GetStoreMixRequest getStoreMixRequest = GetStoreMixRequest.builder().partnerId(orderBean.getCompanyId()).storeCode(orderBean.getShopId()).build();
+        QueryFlag query = QueryFlag.builder().queryBusinessInfo(true).queryStoreInfo(true).build();
+        getStoreMixRequest.setQuery(query);
+        ConsoleResponseDTO<BizDTO> storeMix = consoleApiClient.getStoreMix(getStoreMixRequest);
+        if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), storeMix.getStatusCode()) || storeMix.getBizVO() == null || storeMix.getBizVO().getStoreInfo()== null) {
+            return ResponseUtil.error(ResponseResult.STORE_INFO_NOT_FOUND);
+        }
+        return deliveryHandle.createDelivery(orderBean,request,storeMix,false);
     }
 
     private void commonSendEmailAlert(OrderBeanV1 order, OrderBaseResp baseResponse,String desc){

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -81,6 +81,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
+import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import com.google.common.collect.Lists;
 import javafx.util.Pair;
 import ma.glasnost.orika.MapperFacade;