Merge branch 'feature/20210603-v2.0.33-订单获取预计送达时间ID1030763-周晓航' into qa

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

order-application-service/src/main/java/cn/freemud/entities/dto/store/StoreCBaseResponse.java

+package cn.freemud.entities.dto.store;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/6/16 上午9:57
+ * @description :
+ */
+@Data
+public class StoreCBaseResponse<T> {
+    private String code;
+
+    private String message;
+
+    private T result;
+
+    private String ver;
+}

order-application-service/src/main/java/cn/freemud/entities/dto/store/StoreCBaseResponseDto.java

@@ -7,16 +7,11 @@ import java.util.Date;
 /**
  * @author : xh.Z
  * @email : fisherman0510@163.com
- * @Date : 2021/6/16 上午9:57
+ * @Date : 2021/6/17 上午11:36
  * @description :
  */
 @Data
 public class StoreCBaseResponseDto {
-    private String code;
+    private Date expectArriveTime;
 
-    private String message;
-
-    private Date result;
-
-    private String ver;
 }

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

@@ -26,6 +26,7 @@ import cn.freemud.entities.dto.order.BusinessDate;
 import cn.freemud.entities.dto.shoppingCart.GetShoppingCartGoodsApportionDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.dto.store.GetEstimateDeliveryRequest;
+import cn.freemud.entities.dto.store.StoreCBaseResponse;
 import cn.freemud.entities.dto.store.StoreCBaseResponseDto;
 import cn.freemud.entities.vo.CreateOrderVo;
 import cn.freemud.entities.vo.GetMemberCouponRequestVo;
@@ -936,7 +937,7 @@ public class CheckOrder {
         GetEstimateDeliveryRequest request = GetEstimateDeliveryRequest.builder().latitude(userLat).longitude(userLong).build();
         request.setPartnerId(partnerId);
         request.setStoreCode(storeCode);
-        StoreCBaseResponseDto responseDto = storeBaseApiClient.queryDeliverDetail(request);
+        StoreCBaseResponse<StoreCBaseResponseDto> responseDto = storeBaseApiClient.queryDeliverDetail(request);
         if (responseDto == null) {
             throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR);
         }
@@ -944,7 +945,7 @@ public class CheckOrder {
         if(!ResponseResult.SUCCESS.getCode().equals(responseDto.getCode()) || responseDto.getResult() == null){
             throw new ServiceException(ResponseResult.STORE_QUERYEXPECTARRIVETIME);
         }
-        return  responseDto.getResult();
+        return  responseDto.getResult().getExpectArriveTime();
     }
 
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/StoreBaseApiClient.java

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.entities.dto.store.StoreCBaseResponseDto;
+import cn.freemud.entities.dto.store.StoreCBaseResponse;
 import cn.freemud.entities.dto.store.StoreInfoRequestDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -18,6 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping(value = "/store", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 public interface StoreBaseApiClient {
 
-    @PostMapping(value = "/delivery/queryExpectArriveTime")
-    StoreCBaseResponseDto queryDeliverDetail(@RequestBody StoreInfoRequestDto request);
+    @PostMapping(value = "/delivery/calcDeliveryData")
+    StoreCBaseResponse queryDeliverDetail(@RequestBody StoreInfoRequestDto request);
 }