update:地址增加

fengliang
1 parent aae583d0
Showing 8 changed files with 529 additions and 0 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderContactPersonController.java
etrade-order/src/main/java/com/diligrp/etrade/order/dao/BaseRegionMapper.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/contactPerson/BaseRegionCo.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/contactPerson/BaseRegionNextVo.java
etrade-order/src/main/java/com/diligrp/etrade/order/model/BaseRegion.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/BaseRegionService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/BaseRegionServiceImpl.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/BaseRegionMapper.xml
@@ -5,8 +5,11 @@ import cn.hutool.core.lang.Assert;
 import com.diligrp.etrade.core.domain.Message;
 import com.diligrp.etrade.core.domain.PageMessage;
 import com.diligrp.etrade.core.util.NameUtil;
+import com.diligrp.etrade.order.domain.contactPerson.BaseRegionCo;
+import com.diligrp.etrade.order.domain.contactPerson.BaseRegionNextVo;
 import com.diligrp.etrade.order.domain.contactPerson.OrderContactPersonCo;
 import com.diligrp.etrade.order.domain.contactPerson.OrderContactPersonListCo;
+import com.diligrp.etrade.order.service.BaseRegionService;
 import com.diligrp.etrade.order.service.OrderContactPersonService;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
@@ -14,6 +17,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
  
+import java.util.List;
+
 /**
  * 订单配送地址
  * @author fengliang
@@ -25,6 +30,10 @@ public class OrderContactPersonController {
     private static final Logger log = LoggerFactory.getLogger(OrderContactPersonController.class);
     @Resource
     OrderContactPersonService orderContactPersonService;
+
+    @Resource
+    BaseRegionService baseRegionService;
+
     @GetMapping("/test")
     public Message<String> test() {
         return Message.success("test");
@@ -72,5 +81,11 @@ public class OrderContactPersonController {
         log.info("联系人列表查询 param={}", co);
         return orderContactPersonService.page(co);
     }
+
+    @PostMapping(value = "/baseRegion")
+    public Message<List<BaseRegionNextVo>> setDefault(@RequestBody BaseRegionCo co) {
+        List<BaseRegionNextVo> baseRegionNextVoList = baseRegionService.getNextList(co);
+        return Message.success(baseRegionNextVoList);
+    }
 }
  
+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 java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenzhiwei
+ * @since 2023-12-27
+ */
+public interface BaseRegionMapper extends MybatisMapperSupport {
+
+    List<BaseRegion> selectNextList(BaseRegionCo co);
+}
+package com.diligrp.etrade.order.domain.contactPerson;
+
+public class BaseRegionCo {
+    /**
+     * 市场id
+     */
+    private Long marketId;
+
+    /**
+     * 省份id
+     */
+    private Long provinceId;
+    /**
+     * 城市id
+     */
+    private Long cityId;
+    /**
+     * 区县id
+     */
+    private Long districtId;
+    /**
+     * 街道id
+     */
+    private Long streetId;
+    /**
+     * 市场id
+     */
+    private Integer state = 1;
+
+    public Long getMarketId() {
+        return marketId;
+    }
+
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
+    }
+
+    public Long getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(Long provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public Long getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(Long cityId) {
+        this.cityId = cityId;
+    }
+
+    public Long getDistrictId() {
+        return districtId;
+    }
+
+    public void setDistrictId(Long districtId) {
+        this.districtId = districtId;
+    }
+
+    public Long getStreetId() {
+        return streetId;
+    }
+
+    public void setStreetId(Long streetId) {
+        this.streetId = streetId;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+}
+package com.diligrp.etrade.order.domain.contactPerson;
+
+import java.util.List;
+
+public class BaseRegionNextVo {
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * 级别，省 1，市 2，区县 3，街道 4
+     */
+    private Integer leavel;
+    /**
+     * 下级区域
+     */
+    private List<BaseRegionNextVo> children;
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getLeavel() {
+        return leavel;
+    }
+
+    public void setLeavel(Integer leavel) {
+        this.leavel = leavel;
+    }
+
+    public List<BaseRegionNextVo> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<BaseRegionNextVo> children) {
+        this.children = children;
+    }
+
+    public BaseRegionNextVo(){
+
+    }
+    public BaseRegionNextVo(Long id,String name,Integer leavel){
+        this.id = id;
+        this.name = name;
+        this.leavel = leavel;
+    }
+}
+package com.diligrp.etrade.order.model;
+
+import com.diligrp.etrade.core.domain.BaseDo;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+public class BaseRegion extends BaseDo implements Serializable {
+
+    /**
+     * 主键
+     */
+    private Long id;
+    /**
+     * 市场id
+     */
+    private Long marketId;
+    /**
+     * 省份id
+     */
+    private Long provinceId;
+    /**
+     * 城市id
+     */
+    private Long cityId;
+
+    /**
+     * 区id
+     */
+    private Long districtId;
+
+    /**
+     * 街道id
+     */
+    private Long streetId;
+
+    /**
+     * 省份名称
+     */
+    private String provinceName;
+
+    /**
+     * 城市名称
+     */
+    private String cityName;
+    /**
+     * 区县名称
+     */
+    private String districtName;
+    /**
+     * 街道名称
+     */
+    private String streetName;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+    @Override
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getMarketId() {
+        return marketId;
+    }
+
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
+    }
+
+    public Long getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(Long provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public Long getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(Long cityId) {
+        this.cityId = cityId;
+    }
+
+    public Long getDistrictId() {
+        return districtId;
+    }
+
+    public void setDistrictId(Long districtId) {
+        this.districtId = districtId;
+    }
+
+    public Long getStreetId() {
+        return streetId;
+    }
+
+    public void setStreetId(Long streetId) {
+        this.streetId = streetId;
+    }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getDistrictName() {
+        return districtName;
+    }
+
+    public void setDistrictName(String districtName) {
+        this.districtName = districtName;
+    }
+
+    public String getStreetName() {
+        return streetName;
+    }
+
+    public void setStreetName(String streetName) {
+        this.streetName = streetName;
+    }
+
+    @Override
+    public LocalDateTime getCreatedTime() {
+        return createdTime;
+    }
+
+    @Override
+    public void setCreatedTime(LocalDateTime createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    @Override
+    public LocalDateTime getModifiedTime() {
+        return modifiedTime;
+    }
+
+    @Override
+    public void setModifiedTime(LocalDateTime modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+}
+package com.diligrp.etrade.order.service;
+
+import com.diligrp.etrade.order.domain.contactPerson.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenzhiwei
+ * @since 2023-12-27
+ */
+public interface BaseRegionService {
+    List<BaseRegionNextVo> getNextList(BaseRegionCo co);
+}
+package com.diligrp.etrade.order.service.impl;
+
+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.BaseRegionMapper;
+import com.diligrp.etrade.order.dao.OrderContactPersonMapper;
+import com.diligrp.etrade.order.domain.contactPerson.*;
+import com.diligrp.etrade.order.exception.OrderErrorCode;
+import com.diligrp.etrade.order.exception.OrderException;
+import com.diligrp.etrade.order.model.BaseRegion;
+import com.diligrp.etrade.order.model.OrderContactPerson;
+import com.diligrp.etrade.order.service.BaseRegionService;
+import com.diligrp.etrade.order.service.OrderContactPersonService;
+import com.diligrp.etrade.order.type.OrderContactDefaultType;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import jakarta.annotation.Resource;
+import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author chenzhiwei
+ * @since 2023-12-27
+ */
+@Service
+public class BaseRegionServiceImpl implements BaseRegionService {
+    private final static Logger logger = LoggerFactory.getLogger(BaseRegionServiceImpl.class);
+    @Resource
+    private BaseRegionMapper baseRegionMapper;
+
+
+    @Override
+    public List<BaseRegionNextVo> getNextList(BaseRegionCo co) {
+        if(co.getMarketId() == null){
+            throw new OrderException(OrderErrorCode.PARAM_ERROR, "市场不能为空");
+        }
+        List<BaseRegion> baseRegions = baseRegionMapper.selectNextList(co);
+        if (ObjectUtils.isEmpty(baseRegions)){
+            return new ArrayList<>();
+        }
+        Map<Long, BaseRegionNextVo> citiesMap = new HashMap<>();
+        Map<Long, BaseRegionNextVo> districtsMap = new HashMap<>();
+        List<BaseRegionNextVo> streetList = new ArrayList<>();
+        List<BaseRegionNextVo> provinces = new ArrayList<>();
+        BaseRegionNextVo baseDistrict = null;
+        BaseRegionNextVo baseCity = null;
+        BaseRegionNextVo baseProvince = null;
+
+        BaseRegion lastBaseRegion = null;
+        for(BaseRegion baseRegion:baseRegions){
+            if(lastBaseRegion!=null&&!lastBaseRegion.getDistrictId().equals(baseRegion.getDistrictId())){
+                baseDistrict = new BaseRegionNextVo(lastBaseRegion.getDistrictId(), lastBaseRegion.getDistrictName(),3);
+                baseDistrict.setChildren(streetList);
+                streetList = new ArrayList<>();
+                if(lastBaseRegion!=null && !lastBaseRegion.getCityId().equals(baseRegion.getCityId())){
+                    baseCity = new BaseRegionNextVo(lastBaseRegion.getCityId(), lastBaseRegion.getCityName(),2);
+                    baseCity.setChildren(new ArrayList<>(districtsMap.values()));
+                    districtsMap = new HashMap<>();
+                    if(lastBaseRegion!=null && !lastBaseRegion.getProvinceId().equals(baseRegion.getProvinceId())){
+                        baseProvince = new BaseRegionNextVo(lastBaseRegion.getProvinceId(), lastBaseRegion.getProvinceName(),1);
+                        baseProvince.setChildren(new ArrayList<>(citiesMap.values()));
+                        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(lastBaseRegion.getStreetId(), lastBaseRegion.getStreetName(),4);
+            streetList.add(street);
+            lastBaseRegion = baseRegion;
+        }
+        if(baseDistrict!=null){
+            baseDistrict.setChildren(streetList);
+
+        }else{
+            baseDistrict = new BaseRegionNextVo(lastBaseRegion.getDistrictId(), lastBaseRegion.getDistrictName(),3);
+            baseDistrict.setChildren(streetList);
+        }
+        districtsMap.put(baseDistrict.getId(),baseDistrict);
+        if(baseCity!=null){
+            baseCity.setChildren(new ArrayList<>(districtsMap.values()));
+        }else{
+            baseCity = new BaseRegionNextVo(lastBaseRegion.getCityId(), lastBaseRegion.getCityName(),2);
+            baseCity.setChildren(new ArrayList<>(districtsMap.values()));
+        }
+        citiesMap.put(baseCity.getId(),baseCity);
+        if(baseProvince!=null){
+            baseProvince.setChildren(new ArrayList<>(citiesMap.values()));
+        }else{
+            baseProvince = new BaseRegionNextVo(lastBaseRegion.getProvinceId(), lastBaseRegion.getProvinceName(),1);
+            baseProvince.setChildren(new ArrayList<>(citiesMap.values()));
+        }
+        provinces.add(baseProvince);
+
+        return provinces;
+    }
+}
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diligrp.etrade.order.dao.BaseRegionMapper">
+  <resultMap id="BaseResultMap" type="com.diligrp.etrade.order.model.BaseRegion">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="market_id" jdbcType="BIGINT" property="marketId" />
+    <result column="state" jdbcType="TINYINT" property="state" />
+    <result column="province_id" jdbcType="BIGINT" property="provinceId" />
+    <result column="province_name" jdbcType="VARCHAR" property="provinceName" />
+    <result column="city_id" jdbcType="BIGINT" property="cityId" />
+    <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="created_time" jdbcType="TIMESTAMP" property="createdTime" />
+    <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, market_id, state, province_id, province_name, city_id, city_name, district_id,
+    district_name, street_id, street_name, created_time, modified_time, version
+  </sql>
+  <select id="selectNextList" parameterType="com.diligrp.etrade.order.domain.contactPerson.BaseRegionCo" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from base_region
+    <where> 1=1
+      <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>
+    order by province_id,city_id,district_id,street_id
+  </select>
+</mapper>
 \ No newline at end of file