查询门店信息接口统一

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

@@ -47,7 +47,9 @@ public class UserDeliveryInfoDto {
     private Boolean userEnableTakeaway;
     /**
      * 实际需要支付配送费
+     * 都从购物车计算出配送费
      */
+    @Deprecated
     private Long realDeliveryAmount;
     /**
      * 起送费单位分

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

@@ -77,4 +77,8 @@ public class DeliveryInfoDTO {
     private DeliveryInfoExpFields expandFields;
 
 
+    // TODO: 21-11-15 参数待送门店新接口获取 
+//    private String minOrderPrice;
+//    private String deliveryFee;
+    
 }

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

-package cn.freemud.manager;
-
-import cn.freemud.entities.db.StoreTableNumber;
-import cn.freemud.manager.dao.StoreTableNumberDao;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class StoreTableNumberManager {
-    @Autowired
-    private StoreTableNumberDao storeTableNumberDao;
-
-    public StoreTableNumber selectOne(String partnerId, String storeId, String tableNumber) {
-        StoreTableNumber storeTableNumber = new StoreTableNumber();
-        storeTableNumber.setPartnerId(partnerId);
-        storeTableNumber.setStoreId(storeId);
-        storeTableNumber.setTableNumber(tableNumber);
-        List<StoreTableNumber> storeTableNumberList = storeTableNumberDao.select(storeTableNumber);
-        if(CollectionUtils.isNotEmpty(storeTableNumberList)) {
-            return storeTableNumberList.get(0);
-        }
-        return null;
-    }
-}
+//package cn.freemud.manager;
+//
+//import cn.freemud.entities.db.StoreTableNumber;
+//import cn.freemud.manager.dao.StoreTableNumberDao;
+//import org.apache.commons.collections4.CollectionUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.List;
+//
+//@Component
+//public class StoreTableNumberManager {
+//    @Autowired
+//    private StoreTableNumberDao storeTableNumberDao;
+//
+//    public StoreTableNumber selectOne(String partnerId, String storeId, String tableNumber) {
+//        StoreTableNumber storeTableNumber = new StoreTableNumber();
+//        storeTableNumber.setPartnerId(partnerId);
+//        storeTableNumber.setStoreId(storeId);
+//        storeTableNumber.setTableNumber(tableNumber);
+//        List<StoreTableNumber> storeTableNumberList = storeTableNumberDao.select(storeTableNumber);
+//        if(CollectionUtils.isNotEmpty(storeTableNumberList)) {
+//            return storeTableNumberList.get(0);
+//        }
+//        return null;
+//    }
+//}

order-application-service/src/main/java/cn/freemud/service/CheckOrderUniversal.java

@@ -212,7 +212,7 @@ public abstract class CheckOrderUniversal {
         String shopId = createOrderBaseVo.getShopId();
 
         // 获取门店信息
-        StoreMixResponseDto storeMixResponseDto = storeService.getStoreInfoNew(partnerId, shopId, false);
+        StoreMixResponseDto storeMixResponseDto = storeService.getStoreInfoNew(partnerId, shopId, false,false);
         if (storeMixResponseDto == null || storeMixResponseDto.getStoreInfo() == null) {
             throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
         }

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

@@ -190,7 +190,7 @@ public class AppOrderServiceImpl implements AppOrderService {
         String partnerId = createOrderReq.getPartnerId();
         String shopId = createOrderReq.getShopId();
         // 获取门店信息
-        StoreMixResponseDto storeMixResponseDto = storeService.getStoreInfoNew(partnerId, shopId, false);
+        StoreMixResponseDto storeMixResponseDto = storeService.getStoreInfoNew(partnerId, shopId, false,false);
         if (storeMixResponseDto == null || storeMixResponseDto.getStoreInfo() == null) {
             throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
         }

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

@@ -146,7 +146,7 @@ public class CheckMCCafeOrder {
         String shopId = createOrderVo.getShopId();
 
         // 获取门店信息
-        StoreMixResponseDto storeMixResponseDto = storeService.getStoreInfoNew(partnerId, shopId, true);
+        StoreMixResponseDto storeMixResponseDto = storeService.getStoreInfoNew(partnerId, shopId, true,false);
         if (storeMixResponseDto == null || storeMixResponseDto.getStoreInfo() == null) {
             throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
         }

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

@@ -107,7 +107,7 @@ public class CheckMallOrder {
         String shopId = createOrderVo.getShopId();
 
         // 获取门店信息
-        StoreMixResponseDto storeMixResponseDto = storeService.getStoreInfoNew(partnerId, shopId, false);
+        StoreMixResponseDto storeMixResponseDto = storeService.getStoreInfoNew(partnerId, shopId, false,false);
         if (storeMixResponseDto == null || storeMixResponseDto.getStoreInfo() == null) {
             throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
         }

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

@@ -199,7 +199,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         }
         String storeId = wxAppStore.getStoreId();
         // 获取门店信息
-        StoreMixResponseDto storeMixResponseDto = storeService.getStoreInfoNew(partnerId, storeId, false);
+        StoreMixResponseDto storeMixResponseDto = storeService.getStoreInfoNew(partnerId, storeId, false,false);
         if (storeMixResponseDto == null || storeMixResponseDto.getStoreInfo() == null) {
             throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
         }
@@ -311,7 +311,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
             return ResponseUtil.error(ResponseResult.PAY_SVC_CONFIG_ERROR);
         }
         // 获取门店信息
-        StoreMixResponseDto storeMixResponseDto = storeService.getStoreInfoNew(partnerId, storeId, false);
+        StoreMixResponseDto storeMixResponseDto = storeService.getStoreInfoNew(partnerId, storeId, false,false);
         if (storeMixResponseDto == null || storeMixResponseDto.getStoreInfo() == null) {
             throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
         }

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

@@ -11,6 +11,7 @@ import cn.freemud.enums.ScopeConfigType;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.StoreService;
+import cn.freemud.service.store.StoreManager;
 import cn.freemud.service.thirdparty.StoreClient;
 import cn.freemud.utils.SpringBeanUtil;
 import cn.freemud.utils.WebUtil;
@@ -42,6 +43,9 @@ public class StoreServiceImpl implements StoreService {
     @Autowired
     private RedisCache redisCache;
 
+    @Autowired
+    private StoreManager storeManager;
+
 
 
     /**
@@ -63,14 +67,15 @@ public class StoreServiceImpl implements StoreService {
     /**
      * 查询门店信息新接口
      */
-    public StoreMixResponseDto getStoreInfoNew(String partnerId, String shopId, Boolean queryBusinessInfo) {
+    public StoreMixResponseDto getStoreInfoNew(String partnerId, String shopId, Boolean queryBusinessInfo,Boolean queryDeliveryInfo) {
         // 获取门店信息
         StoreInfoRequestDto request = new StoreInfoRequestDto();
         request.setPartnerId(partnerId);
         request.setStoreCode(shopId);
         StoreInfoRequestDto.QueryInfo query = new StoreInfoRequestDto.QueryInfo();
-//        query.setQueryStoreInfo(true);
+        query.setQueryStoreInfo(true);
         query.setQueryBusinessInfo(queryBusinessInfo);
+        query.setQueryDeliveryInfo(queryDeliveryInfo);
         request.setQuery(query);
         StoreBaseResponseDto<StoreMixResponseDto> storeInfoNew = storeClient.getStoreInfoNew(request);
 
@@ -134,8 +139,8 @@ public class StoreServiceImpl implements StoreService {
                 .userLongitude(userLongitude)
                 .userLatitude(userLatitude)
                 .deliveryLimitAmount(storeDeliveryInfoDto.getDeliveryLimitAmount())
-                .userEnableTakeaway(checkUserEnableDelivery(storeDeliveryInfoDto, userLongitude, userLatitude))
-                .realDeliveryAmount(getUserRealDeliveryAmount(storeDeliveryInfoDto, userLongitude, userLatitude))
+                .userEnableTakeaway(true)
+                .realDeliveryAmount(0L)
                 .storeId(storeDeliveryInfoDto.getStoreId())
                 .storeName(storeDeliveryInfoDto.getStoreName())
                 .storeDeliveryInfoDto(storeDeliveryInfoDto).build();
@@ -193,9 +198,9 @@ public class StoreServiceImpl implements StoreService {
      * @return
      */
     public Long getUserRealDeliveryAmount(StoreDeliveryInfoDto storeDeliveryInfoDto, String userLongitude, String userLatitude) {
-        if (!checkUserEnableDelivery(storeDeliveryInfoDto, userLongitude, userLatitude)) {
-            return 0L;
-        }
+//        if (!checkUserEnableDelivery(storeDeliveryInfoDto, userLongitude, userLatitude)) {
+//            return 0L;
+//        }
         // TODO 用户收货地址距离门店距离 单位米 如果门店没有设置阶层配送费，配送费默认=基础配送费
         if (storeDeliveryInfoDto.getAddRangeCount() == null || storeDeliveryInfoDto.getAddRangeCount() <= 0) {
             return storeDeliveryInfoDto.getDeliveryAmount();