Merge branches 'feature/20211122_查询门店配送接口合并_wuping' and 'master' of…

Merge branches 'feature/20211122_查询门店配送接口合并_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

order-application-service/src/main/java/cn/freemud/entities/bo/CreateOrderBONew.java

 package cn.freemud.entities.bo;
 
+import cn.freemud.entities.dto.UserDeliveryInfoDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.dto.store.StoreMixResponseDto;
 import cn.freemud.entities.vo.CreateOrderVo;
@@ -25,6 +26,12 @@ public class CreateOrderBONew {
     //订单扩展字段信息
     private  OrderExtInfoDto extInfo;
 
+    /**
+     * 内部参数
+     * 用户收货地址信息 ，入参不需要传,通过校验receiveId获取
+     */
+    public UserDeliveryInfoDto userDeliveryInfoDto;
+
     public CreateOrderBONew() {
     }
 

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

@@ -7,6 +7,7 @@ import java.util.Date;
 import java.util.List;
 
 @Data
+@Deprecated
 public class StoreDeliveryInfoDto {
 
     private String partnerId;
@@ -18,6 +19,7 @@ public class StoreDeliveryInfoDto {
     /**
      * 门店是否可配送
      */
+    @Deprecated
     private Boolean enableTakeaway;
     /**
      * 起送费单位分
@@ -78,6 +80,8 @@ public class StoreDeliveryInfoDto {
      */
     private String deliveryType;
 
+    private String deliveryTypeString;
+
     /**
      * 预订单自定义推单时间
      */

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

@@ -52,13 +52,15 @@ public class UserDeliveryInfoDto {
     @Deprecated
     private Long realDeliveryAmount;
     /**
-     * 起送费单位分
+     * 起送费单位分 (门店配送信息字段)
      */
+    @Deprecated
     private Long deliveryLimitAmount;
 
     /**
      * 门店配送信息
      */
+    @Deprecated
     private StoreDeliveryInfoDto storeDeliveryInfoDto;
     
     /**

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

@@ -76,9 +76,44 @@ public class DeliveryInfoDTO {
      */
     private DeliveryInfoExpFields expandFields;
 
+    /**
+     * 配送区域名称
+     */
+    private String areaName;
+
+    /**
+     * 下单范围类型 1手工画范围 2半径服务
+     */
+    private Integer positionScopeType;
+
+    /**
+     * 起送价格（分）
+     */
+    private String minOrderPrice;
+
+    /**
+     * 配送费（分）
+     */
+    private String deliveryFee;
 
-    // TODO: 21-11-15 参数待送门店新接口获取 
-//    private String minOrderPrice;
-//    private String deliveryFee;
+    /**
+     * 配送时间（分钟）
+     */
+    private Integer deliveryTime;
+
+    /**
+     * 下单范围，格式：jsonArray，或者半径（米）
+     */
+    private String positionScope;
+
+    /**
+     * 实际需要支付配送费
+     */
+    private Integer finalDeliveryAmount;
+
+    /**
+     * 配送费为零的原因：0:正常,1:超出配送范围
+     */
+    private Integer deliveryFeeZeroReason = 0;
     
 }

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

@@ -25,6 +25,16 @@ public class StoreInfoRequestDto {
 
     private QueryInfo query;
 
+    /**
+     * 用户收货地址经度
+     */
+    private String userLongitude;
+
+    /**
+     * 用户收货地址维度
+     */
+    private String userLatitude;
+
     public StoreInfoRequestDto(String partnerId, String storeCode) {
         this.partnerId = partnerId;
         this.storeCode = storeCode;

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

@@ -13,11 +13,9 @@
 package cn.freemud.service.impl;
 
 import cn.freemud.base.util.DateUtil;
-import cn.freemud.base.util.JsonUtil;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.constant.StoreConstant;
 import cn.freemud.entities.dto.GetCouponDetailResponseDto;
-import cn.freemud.entities.dto.StoreDeliveryInfoDto;
 import cn.freemud.entities.dto.StoreResponseDto;
 import cn.freemud.entities.dto.UserDeliveryInfoDto;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
@@ -27,7 +25,6 @@ import cn.freemud.entities.dto.store.StoreMixResponseDto;
 import cn.freemud.entities.vo.CreateOrderVo;
 import cn.freemud.entities.vo.GetMemberCouponRequestVo;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
-import cn.freemud.entities.vo.delivery.DeliveryAmountVo;
 import cn.freemud.enums.BusinessTypeEnum;
 import cn.freemud.enums.CouponFlag;
 import cn.freemud.enums.OrderChannelType;

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

@@ -458,7 +458,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         orderExtInfoDto.setFromAppId(userLoginInfoDto.getWxAppId());
         orderExtInfoDto.setUnDistribution(requestVo.getUnDistribution());
         createPrepayRequestDto.setOrderExtInfoDTO(orderExtInfoDto);
-        if (StringUtils.isNotBlank(requestVo.getCardCode())) {
+        if (StringUtils.isNotBlank(requestVo.getCardCode()) || createPrepayRequestDto.getTotalAmount() == 0) {
             return ResponseUtil.success(payService.createPrepayOrder(createPrepayRequestDto));
         }