update:地址列表筛选是否可配送

fengliang
1 parent f1721899
Showing 18 changed files with 223 additions and 43 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderContactPersonController.java
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderDeliveryController.java
etrade-order/src/main/java/com/diligrp/etrade/order/dao/BaseRegionMapper.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderDeliveryDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/contactPerson/OrderContactPersonCo.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/contactPerson/OrderContactPersonListCo.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/contactPerson/OrderContactPersonListVo.java
etrade-order/src/main/java/com/diligrp/etrade/order/model/OrderContactPerson.java
etrade-order/src/main/java/com/diligrp/etrade/order/model/OrderDelivery.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/BaseRegionService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderContactPersonService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderDeliveryService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/BaseRegionServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderContactPersonServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderDeliveryServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/contactPerson/OrderContactPersonMapper.xml
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/BaseRegionMapper.xml
@@ -92,5 +92,17 @@ public class OrderContactPersonController {
         List<BaseRegionNextVo> baseRegionNextVoList = baseRegionService.getNextList(co);
         return Message.success(baseRegionNextVoList);
     }
+
+
+    /**
+     * 查询地址是否可配送
+     * @param co
+     * @return
+     */
+    @PostMapping(value = "/checkRegion")
+    public Message<Boolean> checkRegion(@RequestBody BaseRegionCo co) {
+        baseRegionService.checkRegion(co.getProvinceId(),co.getCityId(),co.getDistrictId(),co.getStreetId(),co.getMarketId());
+        return Message.success(true);
+    }
 }
@@ -2,6 +2,7 @@ package com.diligrp.etrade.order.api;
 import com.diligrp.etrade.core.domain.Message;
 import com.diligrp.etrade.order.domain.OrderOperateDto;
+import com.diligrp.etrade.order.service.BaseRegionService;
 import com.diligrp.etrade.order.service.OrderDeliveryService;
 import com.diligrp.etrade.order.type.OrderOrderType;
 import com.diligrp.etrade.order.util.OrderConstant;
@@ -34,6 +35,7 @@ public class OrderDeliveryController {
     @Resource
     private RedissonClient redissonClient;
+
     /**
      * 选择配送方式
      * @param orderOperateDto 操作标识
@@ -4,6 +4,7 @@ package com.diligrp.etrade.order.dao;
 import com.diligrp.etrade.core.mybatis.MybatisMapperSupport;
 import com.diligrp.etrade.order.domain.contactPerson.BaseRegionCo;
 import com.diligrp.etrade.order.model.BaseRegion;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -18,4 +19,6 @@ import java.util.List;
 public interface BaseRegionMapper extends MybatisMapperSupport {
     List<BaseRegion> selectNextList(BaseRegionCo co);
+
+    BaseRegion getRegionsByIds(@Param("provinceId") Long provinceId,@Param("cityId") Long cityId,@Param("districtId") Long districtId,@Param("streetId") Long streetId,@Param("marketId") Long marketId);
 }
@@ -36,13 +36,16 @@ public class OrderDeliveryDto {
     private Integer wayType;
     /** 省份 */
+    @NotNull(message = "省份不能为空")
     private Long provinceId;
     /** 省份名称 */
+
     @NotNull(message = "省份不能为空")
     private String provinceName;
     /** 城市 */
+    @NotNull(message = "城市不能为空")
     private Long cityId;
     /** 城市 */
@@ -50,12 +53,26 @@ public class OrderDeliveryDto {
     private String cityName;
     /** 区县 */
+    @NotNull(message = "区县不能为空")
     private Long districtId;
     /** 区县 */
     @NotNull(message = "区县不能为空")
     private String districtName;
+    /**
+     * 街道
+     */
+    @NotNull(message = "街道不能为空")
+    private Long streetId;
+
+    /**
+     * 街道名称
+     */
+    @NotNull(message = "街道名称不能为空")
+    private String streetName;
+
+
     /** 收货人电话 */
     @NotNull(message = "电话号码不能为空")
     @Length(max = 11,message = "电话号码不能超过11位")
@@ -229,4 +246,20 @@ public class OrderDeliveryDto {
     public void setModifierId(Long modifierId) {
         this.modifierId = modifierId;
     }
+
+    public Long getStreetId() {
+        return streetId;
+    }
+
+    public void setStreetId(Long streetId) {
+        this.streetId = streetId;
+    }
+
+    public String getStreetName() {
+        return streetName;
+    }
+
+    public void setStreetName(String streetName) {
+        this.streetName = streetName;
+    }
 }
@@ -51,32 +51,47 @@ public class OrderContactPersonCo extends BaseDo {
     /**
      * 省份
      */
+    @NotNull(message = "省份不能为空")
     private Long provinceId;
     /**
-     * 省份
+     * 省份名称
      */
-    @NotNull(message = "省份不能为空")
+    @NotNull(message = "省份名称不能为空")
     private String provinceName;
     /**
      * 城市
      */
+    @NotNull(message = "城市不能为空")
     private Long cityId;
     /**
-     * 城市
+     * 城市名称
      */
-    @NotNull(message = "城市不能为空")
+    @NotNull(message = "城市名称不能为空")
     private String cityName;
     /**
      * 区县
      */
+    @NotNull(message = "区县不能为空")
     private Long districtId;
     /**
-     * 区县
+     * 区县名称
      */
-    @NotNull(message = "区县不能为空")
+    @NotNull(message = "区县名称不能为空")
     private String districtName;
     /**
+     * 街道
+     */
+    @NotNull(message = "街道不能为空")
+    private Long streetId;
+
+    /**
+     * 街道名称
+     */
+    @NotNull(message = "街道名称不能为空")
+    private String streetName;
+
+    /**
      * 状态 1：启用 2：禁用
      * @return
      */
@@ -18,6 +18,11 @@ public class OrderContactPersonListCo extends BasePageQuery {
     private Long createrId;
     /**
+     * 市场id
+     */
+    private Long marketId;
+
+    /**
      * 姓名
      */
     private String name;
@@ -65,4 +70,12 @@ public class OrderContactPersonListCo extends BasePageQuery {
     public void setMobile(String mobile) {
         this.mobile = mobile;
     }
+
+    public Long getMarketId() {
+        return marketId;
+    }
+
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
+    }
 }
 \ No newline at end of file
@@ -79,6 +79,11 @@ public class OrderContactPersonListVo implements Serializable {
     private Integer defaultType;
+    /**
+     * 是否可配送 0 不可配送，1可配送
+     */
+    private Integer deliverable;
+
     public Integer getDefaultType() {
         return defaultType;
     }
@@ -209,4 +214,12 @@ public class OrderContactPersonListVo implements Serializable {
     public void setVersion(Integer version) {
         this.version = version;
     }
+
+    public Integer getDeliverable() {
+        return deliverable;
+    }
+
+    public void setDeliverable(Integer deliverable) {
+        this.deliverable = deliverable;
+    }
 }
 \ No newline at end of file
@@ -62,6 +62,15 @@ public class OrderContactPerson extends BaseDo {
      * 区县
      */
     private String districtName;
+    /**
+     * 街道
+     */
+    private Long streetId;
+
+    /**
+     * 街道名称
+     */
+    private String streetName;
     /**
      * 状态 1:启用 2：禁用
@@ -186,6 +195,22 @@ public class OrderContactPerson extends BaseDo {
         this.state = state;
     }
+    public Long getStreetId() {
+        return streetId;
+    }
+
+    public void setStreetId(Long streetId) {
+        this.streetId = streetId;
+    }
+
+    public String getStreetName() {
+        return streetName;
+    }
+
+    public void setStreetName(String streetName) {
+        this.streetName = streetName;
+    }
+
     @Override
     public String toString() {
         return "EcapContactPersonDo{" +
@@ -201,6 +226,8 @@ public class OrderContactPerson extends BaseDo {
                 ", cityName='" + cityName + '\'' +
                 ", districtId=" + districtId +
                 ", districtName='" + districtName + '\'' +
+                ", streetId=" + streetId +
+                ", streetName='" + streetName + '\'' +
                 ", state=" + state +
                 ", id=" + id +
                 ", version=" + version +
@@ -43,6 +43,15 @@ public class OrderDelivery {
     /** 区县 */
     private String districtName;
+    /**
+     * 街道
+     */
+    private Long streetId;
+
+    /**
+     * 街道名称
+     */
+    private String streetName;
     /** 收货人电话 */
     private String receiverPhone;
@@ -14,4 +14,13 @@ import java.util.List;
  */
 public interface BaseRegionService {
     List<BaseRegionNextVo> getNextList(BaseRegionCo co);
+
+    /**
+     * 校验是否可配送
+     * @param provinceId
+     * @param cityId
+     * @param districtId
+     * @param streetId
+     */
+    void checkRegion(Long provinceId, Long cityId, Long districtId, Long streetId,Long marketId);
 }
@@ -3,6 +3,7 @@ package com.diligrp.etrade.order.service;
 import com.diligrp.etrade.core.domain.Message;
 import com.diligrp.etrade.core.domain.PageMessage;
+import com.diligrp.etrade.order.domain.OrderCreateDto;
 import com.diligrp.etrade.order.domain.contactPerson.OrderContactPersonCo;
 import com.diligrp.etrade.order.domain.contactPerson.OrderContactPersonListCo;
 import com.diligrp.etrade.order.domain.contactPerson.OrderContactPersonListVo;
 package com.diligrp.etrade.order.service;
+import com.diligrp.etrade.order.domain.OrderCreateDto;
 import com.diligrp.etrade.order.domain.OrderOperateDto;
 import com.diligrp.etrade.order.model.Order;
 import com.diligrp.etrade.order.model.OrderDelivery;
@@ -26,4 +27,10 @@ public interface OrderDeliveryService {
     /**  订单配送超时自动收货 */
     void endOrderDeliveryOutTime();
+
+    /**
+     * 校验配送地址
+     * @param orderCreateDto
+     */
+    void checkPersonContact(OrderCreateDto orderCreateDto);
 }
@@ -76,23 +76,8 @@ public class BaseRegionServiceImpl implements BaseRegionService {
                         citiesMap = new HashMap<>();
                         provinces.add(baseProvince);
                     }
-//                    BaseRegionNextVo city = new BaseRegionNextVo(baseRegion.getCityId(), baseRegion.getCityName(),2);
-//                    citiesMap.put(baseRegion.getCityId(),city);
-                }/*else{
-                    if(citiesMap.get(baseRegion.getCityId())==null){
-                        BaseRegionNextVo city = new BaseRegionNextVo(baseRegion.getCityId(), baseRegion.getCityName(),2);
-                        citiesMap.put(baseRegion.getCityId(),city);
-                    }
-                }*/
-//                BaseRegionNextVo district = new BaseRegionNextVo(baseRegion.getDistrictId(), baseRegion.getDistrictName(),3);
-//                districtsMap.put(district.getId(),district);
-            }/*else{
-                if(districtsMap.get(baseRegion.getDistrictId())==null){
-                    BaseRegionNextVo district = new BaseRegionNextVo(baseRegion.getDistrictId(), baseRegion.getDistrictName(),3);
-                    districtsMap.put(baseRegion.getDistrictId(),district);
                 }
-
-            }*/
+            }
             BaseRegionNextVo street = new BaseRegionNextVo(baseRegion.getStreetId(), baseRegion.getStreetName(),4);
             streetList.add(street);
             lastBaseRegion = baseRegion;
@@ -122,4 +107,12 @@ public class BaseRegionServiceImpl implements BaseRegionService {
         return provinces;
     }
+
+    @Override
+    public void checkRegion(Long provinceId, Long cityId, Long districtId, Long streetId,Long marketId) {
+        BaseRegion baseRegions = baseRegionMapper.getRegionsByIds(provinceId,cityId,districtId,streetId,marketId);
+        if(baseRegions == null){
+            throw new OrderException(OrderErrorCode.PARAM_ERROR,"暂不支持该地址配送");
+        }
+    }
 }
@@ -4,11 +4,14 @@ import com.diligrp.etrade.core.domain.Message;
 import com.diligrp.etrade.core.domain.PageMessage;
 import com.diligrp.etrade.core.util.JsonUtils;
 import com.diligrp.etrade.order.dao.OrderContactPersonMapper;
+import com.diligrp.etrade.order.domain.OrderCreateDto;
 import com.diligrp.etrade.order.domain.contactPerson.OrderContactPersonCo;
 import com.diligrp.etrade.order.domain.contactPerson.OrderContactPersonListCo;
 import com.diligrp.etrade.order.domain.contactPerson.OrderContactPersonListVo;
 import com.diligrp.etrade.order.model.OrderContactPerson;
 import com.diligrp.etrade.order.service.OrderContactPersonService;
+import com.diligrp.etrade.order.type.OrderAchieveState;
+import com.diligrp.etrade.order.type.OrderAchieveType;
 import com.diligrp.etrade.order.type.OrderContactDefaultType;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -3,6 +3,7 @@ package com.diligrp.etrade.order.service.impl;
 import com.diligrp.etrade.order.dao.OrderDeliveryMapper;
 import com.diligrp.etrade.order.dao.OrderExtraMapper;
 import com.diligrp.etrade.order.dao.OrderMapper;
+import com.diligrp.etrade.order.domain.OrderCreateDto;
 import com.diligrp.etrade.order.domain.OrderDeliveryCheckDto;
 import com.diligrp.etrade.order.domain.OrderGetDto;
 import com.diligrp.etrade.order.domain.OrderOperateDto;
@@ -11,11 +12,9 @@ import com.diligrp.etrade.order.exception.OrderException;
 import com.diligrp.etrade.order.model.Order;
 import com.diligrp.etrade.order.model.OrderDelivery;
 import com.diligrp.etrade.order.model.OrderExtra;
-import com.diligrp.etrade.order.service.OrderDeliveryService;
-import com.diligrp.etrade.order.service.OrderExtraService;
-import com.diligrp.etrade.order.service.OrderPaymentService;
-import com.diligrp.etrade.order.service.OrderService;
+import com.diligrp.etrade.order.service.*;
 import com.diligrp.etrade.order.type.OrderAchieveState;
+import com.diligrp.etrade.order.type.OrderAchieveType;
 import com.diligrp.etrade.order.type.OrderOrderState;
 import com.diligrp.etrade.order.type.OrderState;
 import com.diligrp.etrade.order.util.OrderConstant;
@@ -58,6 +57,9 @@ public class OrderDeliveryServiceImpl implements OrderDeliveryService {
     @Resource
     private RedissonClient redissonClient;
+    @Resource
+    private BaseRegionService baseRegionService;
+
     @Override
     public int createOrderDelivery(OrderDelivery orderDelivery) {
         return orderDeliveryMapper.save(orderDelivery);
@@ -239,4 +241,13 @@ public class OrderDeliveryServiceImpl implements OrderDeliveryService {
     }
+    @Override
+    public void checkPersonContact(OrderCreateDto orderCreateDto) {
+        if(orderCreateDto==null||orderCreateDto.getDelivery()==null){
+            return;
+        }
+        if(OrderAchieveType.SELLER_DELIVERY.getCodeInteger().equals(orderCreateDto.getAchieveType())){
+            baseRegionService.checkRegion(orderCreateDto.getDelivery().getProvinceId(),orderCreateDto.getDelivery().getCityId(),orderCreateDto.getDelivery().getDistrictId(),orderCreateDto.getDelivery().getStreetId(),orderCreateDto.getMarketId());
+        }
+    }
 }
@@ -85,9 +85,6 @@ public class OrderServiceImpl implements OrderService {
     private OrderPaymentService orderPaymentService;
     @Resource
-    private OrderPaymentFeeService orderPaymentFeeService;
-
-    @Resource
     private OrderCouponService orderCouponService;
     @Resource
@@ -107,8 +104,6 @@ public class OrderServiceImpl implements OrderService {
     @Resource
     private PayRpcResolver payRpcResolver;
-    @Resource
-    private WeChatPayRpcResolver weChatPayRpcResolver;
     @Resource
     private SettingShopCommonService settingShopCommonService;
@@ -116,15 +111,9 @@ public class OrderServiceImpl implements OrderService {
     private OrderExtraService orderExtraService;
     @Resource
-    private ShopService shopService;
-
-    @Resource
     private OrderDeliveryService orderDeliveryService;
     @Resource
-    private BasicDataConfigRpc basicDataConfigRpc;
-
-    @Resource
     private IShopCartMessageService shopCartMessageService;
     @Resource
@@ -144,6 +133,8 @@ public class OrderServiceImpl implements OrderService {
         orderCreateDto.setShopCustomerId(shop.getCustomerId());
         orderCreateDto.setShopName(shop.getName());
         orderCreateDto.setShopCustomerName(shop.getCustomerName());
+        //效验买方地址是否可配送
+        orderDeliveryService.checkPersonContact(orderCreateDto);
         //验证订单商品总重量与订单商品总价格
         orderGoodsService.checkBuyerOrderDto(orderCreateDto,orderType,transportFeeFlag);
         //创建订单
@@ -188,6 +179,8 @@ public class OrderServiceImpl implements OrderService {
         orderCreateDto.setShopCustomerId(shop.getCustomerId());
         orderCreateDto.setShopName(shop.getName());
         orderCreateDto.setShopCustomerName(shop.getCustomerName());
+        //效验买方地址是否可配送
+        orderDeliveryService.checkPersonContact(orderCreateDto);
         //验证订单商品总重量与订单商品总价格
         orderGoodsService.checkBuyerOrderDto(orderCreateDto,identityType,true);
         //创建订单
@@ -423,6 +416,8 @@ public class OrderServiceImpl implements OrderService {
     @Transactional
     @Override
     public void updateOrder(OrderCreateDto buyerOrderDto, Integer orderType) {
+        //效验买方地址是否可配送
+        orderDeliveryService.checkPersonContact(buyerOrderDto);
         //验证订单商品总重量与订单商品总价格
         orderGoodsService.checkBuyerOrderDto(buyerOrderDto,orderType,true);
         //获取原始订单
@@ -455,6 +450,8 @@ public class OrderServiceImpl implements OrderService {
     public void updateSellerOrder(OrderCreateDto buyerOrderDto, Integer orderType) {
         //获取订单并效验状态
         Order order = getOrderAndCheckState(null, buyerOrderDto.getCode(), buyerOrderDto.getMarketId(),OrderOrderState.SELLER_FIX,buyerOrderDto);
+        //效验买方地址是否可配送
+        orderDeliveryService.checkPersonContact(buyerOrderDto);
         //验证订单商品总重量与订单商品总价格
         orderGoodsService.checkBuyerOrderDto(buyerOrderDto,orderType,true);
         //判断卖方修改人是否有权限修改订单
@@ -17,6 +17,8 @@
       <result column="city_name" jdbcType="VARCHAR" property="cityName" />
       <result column="district_id" jdbcType="BIGINT" property="districtId" />
       <result column="district_name" jdbcType="VARCHAR" property="districtName" />
+      <result column="street_id" jdbcType="BIGINT" property="streetId" />
+      <result column="street_name" jdbcType="VARCHAR" property="streetName" />
       <result column="address" jdbcType="VARCHAR" property="address" />
       <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
       <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
@@ -25,10 +27,7 @@
       <result column="default_type" jdbcType="INTEGER" property="defaultType" />
   </resultMap>
   <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    id,creater_id,creater, name, mobile,extension_number,province_id,province_name,city_id,city_name, district_id,district_name, address, created_time, modified_time,state,version,default_type
+    id,creater_id,creater, `name`, mobile,extension_number,province_id,province_name,city_id,city_name, district_id,district_name, street_id,street_name, address, created_time, modified_time,state,version,default_type
   </sql>
   <insert id="insert" keyColumn="id" keyProperty="id" useGeneratedKeys="true" parameterType="com.diligrp.etrade.order.model.OrderContactPerson">
     INSERT INTO ecap_contact_person(
@@ -43,6 +42,8 @@
       city_name,
       district_id,
       district_name,
+      street_id,
+      street_name,
       address,
       version,
       state,
@@ -57,6 +58,8 @@
       #{provinceName},
       #{cityId},
       #{cityName},
+      #{streetId},
+      #{streetName},
       #{districtId},
       #{districtName},
       #{address},
@@ -70,6 +73,7 @@
                name = #{name},mobile = #{mobile},extension_number = #{extensionNumber},
                province_id = #{provinceId},city_id = #{cityId},
                district_id = #{districtId},province_name = #{provinceName},
+               street_id = #{streetId},street_name = #{streetName},
                city_name = #{cityName},district_name = #{districtName},
                address = #{address},version = #{version}+1,
                state = #{state},default_type = #{defaultType}
@@ -87,8 +91,13 @@
     <select id="list" resultType="com.diligrp.etrade.order.domain.contactPerson.OrderContactPersonListVo">
         SELECT
-        <include refid="Base_Column_List" />
+        p.id id,p.creater_id creater_id,p.creater creater, p.`name` name, p.mobile mobile,p.extension_number extension_number,p.province_id province_id,
+        p.province_name province_name,p.city_id city_id,p.city_name city_name, p.district_id district_id,p.district_name district_name, p.street_id street_id,
+        p.street_name street_name, p.address address, p.created_time created_time, p.modified_time modified_time,p.state state,p.version version,
+        p.default_type default_type,
+        case when br.state is not null then br.state else 0 end as deliverable
         FROM ecap_contact_person p
+        left join base_region br on p.street_id = br.street_id and br.market_id = #{marketId}
         WHERE  p.state = 1
           AND p.creater_id = #{createrId}
         <if test="keyWords !=null and keyWords !=''">
@@ -25,7 +25,8 @@
     select
     <include refid="Base_Column_List" />
     from base_region
-    <where> 1=1
+    <where>
+        market_id = #{marketId,jdbcType=BIGINT}
       <if test="provinceId != null">
         and province_id = #{provinceId,jdbcType=BIGINT}
       </if>
@@ -42,4 +43,26 @@
     </where>
     order by province_id,city_id,district_id,street_id
   </select>
+  <select id="getRegionsByIds" resultType="com.diligrp.etrade.order.model.BaseRegion">
+    select
+    <include refid="Base_Column_List" />
+    from base_region
+    <where>
+      market_id = #{marketId,jdbcType=BIGINT}
+      <if test="provinceId != null">
+        and province_id = #{provinceId,jdbcType=BIGINT}
+      </if>
+      <if test="cityId != null">
+        and city_id = #{cityId,jdbcType=BIGINT}
+      </if>
+      <if test="districtId != null">
+        and district_id= #{districtId,jdbcType=BIGINT}
+      </if>
+      <if test="streetId != null">
+        and street_id= #{streetId,jdbcType=BIGINT}
+      </if>
+      and state = 1
+    </where>
+    limit 1
+  </select>
 </mapper>
 \ No newline at end of file