替换sdk的门店接口调用

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

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/console/DeliveryInfoDTO.java

@@ -71,4 +71,9 @@ public class DeliveryInfoDTO {
      */
     private Integer scopeConfig;
 
+    /**
+     * 固定配送费 单位 分
+     */
+    private Integer finalDeliveryAmount;
+
 }

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

@@ -13,21 +13,16 @@
 
 package cn.freemud.service.delivery.impl;
 
+import cn.freemud.entities.dto.console.*;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
-import cn.freemud.enums.CreateOrderType;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.delivery.DeliveryService;
-import cn.freemud.utils.ResponseUtil;
+import cn.freemud.service.thirdparty.ConsoleApiClient;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
-import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
-import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
-import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
-import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,20 +34,25 @@ public class FixDeliveryServiceImpl extends AbstractDeliveryServiceImpl implemen
     @Autowired
     private StoreCenterService storeCenterService;
 
+    @Autowired
+    private ConsoleApiClient consoleApiClient;
+
     @Override
     public Long calculateDeliveryAmount(String receiveId, String partnerId, String storeId, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) {
-        String trackingNo = LogThreadLocal.getTrackingNo();
-
-        // 获取门店信息，查询基础配送费用
-        StoreInfoRequest storeInfoRequest = new StoreInfoRequest(partnerId, storeId,null);
-        StoreResponse storeResponse = storeCenterService.getStoreInfo(storeInfoRequest, trackingNo);
-        if (storeResponse == null || storeResponse.getBizVO() == null) {
-            throw new ServiceException (ResponseResult.STORE_NOT_FOUND);
-        }
 
+        // 获取门店信息，查询基础配送费用  移除sdk使用, 使用feign
+        GetStoreMixRequest query = GetStoreMixRequest.builder()
+                .partnerId(partnerId)
+                .storeCode(storeId)
+                .query(QueryFlag.builder().queryDeliveryInfo(true).build())
+                .build();
+        ConsoleResponseDTO<BizDTO> responseDto = consoleApiClient.getStoreMix(query);
+        DeliveryInfoDTO deliveryInfo = responseDto.getBizVO().getDeliveryInfo();
+        if (Objects.nonNull(shoppingCartGoodsResponseVo)) {
             shoppingCartGoodsResponseVo.setDeliveryFeeZeroReason(0);
+        }
 
-        return new Double(storeResponse.getBizVO().getDeliveryPrice() * 100).longValue();
+        return Objects.isNull(deliveryInfo.getFinalDeliveryAmount()) ? 0L : deliveryInfo.getFinalDeliveryAmount();
     }
 
     @Override