新增调用C端接口 获取预计送达时间

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

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

@@ -16,10 +16,10 @@ public class GetEstimateDeliveryRequest extends  StoreInfoRequestDto {
     /**
      * 用户收货地址维度
      */
-    private String userLatitude;
+    private String latitude;
 
     /**
      * 用户收货地址经度
      */
-    private String userLongitude;
+    private String longitude;
 }

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

@@ -15,91 +15,6 @@ import java.util.Date;
 @Builder
 public class QueryDeliverDetailResponse {
     /**
-     * 每增加多少公里（单位米）
-     */
-    private String addRange;
-
-    /**
-     * 配送方式:1-三方物流配送、2-商家自配送
-     */
-    private String deliveryMethod;
-
-    /**
-     * 每增加距离增加多少钱（分）
-     */
-    private String addRangeAmount;
-
-    /**
-     * 配送区域名称
-     */
-    private String areaName;
-
-    /**
-     * 实际需要支付配送费
-     */
-    private Long deliveryAmount;
-
-    /**
-     * 配送费（分）
-     */
-    private String deliveryFee;
-
-    /**
-     * 配送费为零的原因：0:正常,1:超出配送范围
-     */
-    private Integer deliveryFeeZeroReason;
-
-    /**
-     * 基础配送范围（单位米）
-     */
-    private String deliveryRange;
-
-    /**
-     * 配送时间（分钟）
-     */
-    private Integer deliveryTime;
-
-    /**
-     * 外卖起送条件（1:杯数，2:金额）
-     */
-    private Integer deliveryType;
-
-    /**
-     * 起送杯数
-     */
-    private Integer freeDeliveryCup;
-
-    /**
-     * 起送价格（分）
-     */
-    private String minOrderPrice;
-
-    /**
-     * 商户编号
-     */
-    private String partnerId;
-
-    /**
-     * 下单范围，格式：jsonArray，或者半径（米）
-     */
-    private String positionScope;
-
-    /**
-     * 下单范围类型 1手工画范围 2半径服务
-     */
-    private Integer positionScopeType;
-
-    /**
-     * 门店编号
-     */
-    private String storeCode;
-
-    /**
-     * 门店id
-     */
-    private String storeId;
-
-    /**
      * 预计送达时间
      */
     private Date expectArriveTime;

order-application-service/src/main/java/cn/freemud/entities/dto/store/StoreCBaseResponseDto.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 StoreCBaseResponseDto {
+    private String code;
+
+    private String message;
+
+    private Date result;
+
+    private String ver;
+}

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -69,6 +69,7 @@ public enum ResponseResult {
     STORE_DELIVERY_HOUR_ERROR("43019", "门店外卖时间错误",""),
     STORE_WILL_COLSE("43020", "门店即将打烊，不能下单",""),
     STORE_DDELIVERY_METHOD("43021", "获取门店外卖配送方式异常",""),
+    STORE_QUERYEXPECTARRIVETIME("43022", "获取门店计算预计送达时间失败",""),
 
     /**
      * 购物车状态码

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

@@ -16,7 +16,9 @@ import cn.freemud.adapter.OrderAdapter;
 import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.constant.StoreConstant;
-import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.GetCouponDetailResponseDto;
+import cn.freemud.entities.dto.StoreDeliveryInfoDto;
+import cn.freemud.entities.dto.UserDeliveryInfoDto;
 import cn.freemud.entities.dto.delivery.DeliveryBaseResponse;
 import cn.freemud.entities.dto.delivery.GetDeliveryFlagRequest;
 import cn.freemud.entities.dto.delivery.GetDeliveryFlagResponseDto;
@@ -24,9 +26,10 @@ 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.StoreBaseResponseDto;
-import cn.freemud.entities.dto.store.StoreInfoRequestDto;
-import cn.freemud.entities.vo.*;
+import cn.freemud.entities.dto.store.StoreCBaseResponseDto;
+import cn.freemud.entities.vo.CreateOrderVo;
+import cn.freemud.entities.vo.GetMemberCouponRequestVo;
+import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.manager.StoreTableNumberManager;
@@ -47,7 +50,6 @@ import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformIapp
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerStoreDeliveryConfigManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.application.sdk.api.base.BaseResponse;
-import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
 import com.freemud.application.sdk.api.membercenter.request.StatisticalPropertyRequest;
@@ -55,10 +57,6 @@ import com.freemud.application.sdk.api.membercenter.response.GetSvcInfoByMemberI
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
 import com.freemud.application.sdk.api.membercenter.service.MemberPropertyService;
-import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
-import com.freemud.application.sdk.api.ordercenter.request.create.DeliveryContactInfoCreateReq;
-import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmountRequest;
-import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
 import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
 import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
@@ -68,7 +66,6 @@ import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.order.enums.StoreDeliveryMethod;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
-import lombok.extern.log4j.Log4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -76,13 +73,10 @@ import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import sun.rmi.runtime.Log;
 
 import java.awt.geom.Point2D;
-import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.*;
@@ -950,17 +944,18 @@ public class CheckOrder {
             throw new ServiceException(ResponseResult.PARAMETER_MISSING);
         }
         // 调用门店接口 获取时间  Fisherman
-        GetEstimateDeliveryRequest request = GetEstimateDeliveryRequest.builder().userLatitude(userLat).userLongitude(userLong).build();
+        GetEstimateDeliveryRequest request = GetEstimateDeliveryRequest.builder().latitude(userLat).longitude(userLong).build();
         request.setPartnerId(partnerId);
         request.setStoreCode(storeCode);
-        StoreBaseResponseDto<cn.freemud.entities.dto.store.QueryDeliverDetailResponse> responseDto = storeBaseApiClient.queryDeliverDetail(request);
+        StoreCBaseResponseDto responseDto = storeBaseApiClient.queryDeliverDetail(request);
         if (responseDto == null) {
             throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR);
         }
-        if(responseDto.getStatusCode() != 100 || responseDto.getBizVO() == null){
-            throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
+
+        if(!ResponseResult.SUCCESS.getCode().equals(responseDto.getCode()) || responseDto.getResult() == null){
+            throw new ServiceException(ResponseResult.STORE_QUERYEXPECTARRIVETIME);
         }
-        return  responseDto.getBizVO().getExpectArriveTime();
+        return  responseDto.getResult();
     }
 
 

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.entities.dto.store.GetEstimateDeliveryRequest;
-import cn.freemud.entities.dto.store.QueryDeliverDetailResponse;
-import cn.freemud.entities.dto.store.StoreBaseResponseDto;
+import cn.freemud.entities.dto.store.StoreCBaseResponseDto;
 import cn.freemud.entities.dto.store.StoreInfoRequestDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -16,10 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @Date : 2021/6/4 下午2:04
  * @description : 门店基础服务
  */
-@FeignClient(name = "CONSOLE-API")
-@RequestMapping(value = "/storecenter", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@FeignClient(name = "store-menu-application-service")
+@RequestMapping(value = "/store", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 public interface StoreBaseApiClient {
 
-    @PostMapping(value = "/storedelivery/v2/queryDeliverDetail")
-    StoreBaseResponseDto<QueryDeliverDetailResponse> queryDeliverDetail(@RequestBody StoreInfoRequestDto request);
+    @PostMapping(value = "/delivery/queryExpectArriveTime")
+    StoreCBaseResponseDto queryDeliverDetail(@RequestBody StoreInfoRequestDto request);
 }