门店域CRUD全接口

gic-store-api/src/main/java/com/gic/store/dto/StoreRegionDTO.java

 package com.gic.store.dto;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author zhiwj
@@ -8,4 +9,95 @@ import java.io.Serializable;
  */
 public class StoreRegionDTO implements Serializable {
     private static final long serialVersionUID = 1802958256860405399L;
+
+    /**
+     *
+     */
+    private Integer regionId;
+
+    /**
+     * 域code
+     */
+    private String regionCode;
+
+    /**
+     *
+     */
+    private String regionName;
+
+    /**
+     * 状态值；1有效  0无效
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     * 企业id
+     */
+    private Integer enterpriseId;
+
+    public Integer getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Integer regionId) {
+        this.regionId = regionId;
+    }
+
+    public String getRegionCode() {
+        return regionCode;
+    }
+
+    public void setRegionCode(String regionCode) {
+        this.regionCode = regionCode;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
 }

gic-store-api/src/main/java/com/gic/store/service/StoreApiService.java

@@ -27,7 +27,4 @@ public interface StoreApiService {
     ServiceResponse<Integer> costStoreMove(String storeIds, String toStoreId);
 
     ServiceResponse<Integer> saveOrUpdate(StoreDTO storeDTO);
-
-
-
 }

gic-store-api/src/main/java/com/gic/store/service/StoreRegionApiService.java

@@ -35,6 +35,6 @@ public interface StoreRegionApiService {
      * 查询全部的门店域
      * @return
      */
-    ServiceResponse<List<StoreRegionDTO>> listStoreRegion();
+    ServiceResponse<List<StoreRegionDTO>> listStoreRegion(Integer enterpriseId, String search);
 
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreRegionMapper.java

 package com.gic.store.dao.mapper;
 
 import com.gic.store.entity.TabStoreRegion;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface TabStoreRegionMapper {
     /**
@@ -50,4 +53,19 @@ public interface TabStoreRegionMapper {
      * @return 更新条目数
      */
     int updateByPrimaryKey(TabStoreRegion record);
+
+    /**
+     * 查询门店域列表
+     * @param enterpriseId 企业id
+     * @param search        域名/code
+     * @return
+     */
+    List<TabStoreRegion> listStoreRegion(@Param("enterpriseId") Integer enterpriseId, @Param("search") String search);
+
+    /**
+     * 查询符合条件的个数； 除id所有值取等于计算， id取不等于计算
+     * @param storeRegion
+     * @return
+     */
+    int countBySelective(TabStoreRegion storeRegion);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/entity/TabStoreBrand.java

@@ -12,6 +12,11 @@ public class TabStoreBrand {
     private Integer storeBrandId;
 
     /**
+     * 品牌code
+     */
+    private String storeBrandCode;
+
+    /**
      * 品牌名称
      */
     private String storeBrandName;
@@ -24,7 +29,7 @@ public class TabStoreBrand {
     /**
      * 排序字段
      */
-    private Integer sort;
+    private Double sort;
 
     /**
      * 
@@ -54,6 +59,14 @@ public class TabStoreBrand {
         this.storeBrandId = storeBrandId;
     }
 
+    public String getStoreBrandCode() {
+        return storeBrandCode;
+    }
+
+    public void setStoreBrandCode(String storeBrandCode) {
+        this.storeBrandCode = storeBrandCode;
+    }
+
     public String getStoreBrandName() {
         return storeBrandName;
     }
@@ -70,11 +83,11 @@ public class TabStoreBrand {
         this.storeBrandCategory = storeBrandCategory;
     }
 
-    public Integer getSort() {
+    public Double getSort() {
         return sort;
     }
 
-    public void setSort(Integer sort) {
+    public void setSort(Double sort) {
         this.sort = sort;
     }
 

gic-store-service/src/main/java/com/gic/store/service/StoreRegionService.java

@@ -21,5 +21,5 @@ public interface StoreRegionService {
 
     Page<StoreRegionDTO> listStoreRegion(Integer enterpriseId, String search, Integer pageNum, Integer pageSize);
 
-    List<StoreRegionDTO> listStoreRegion();
+    List<StoreRegionDTO> listStoreRegion(Integer enterpriseId, String search);
 }

gic-store-service/src/main/java/com/gic/store/service/impl/StoreRegionServiceImpl.java

 package com.gic.store.service.impl;
 
 import com.gic.api.base.commons.Page;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GlobalInfo;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.store.dao.mapper.TabStoreRegionMapper;
 import com.gic.store.dto.StoreRegionDTO;
 import com.gic.store.entity.TabStoreRegion;
@@ -18,6 +20,7 @@ import java.util.List;
  * @date 2019/6/24
  */
 @Service
+@SuppressWarnings("unchecked")
 public class StoreRegionServiceImpl implements StoreRegionService {
 
     @Autowired
@@ -25,12 +28,19 @@ public class StoreRegionServiceImpl implements StoreRegionService {
 
     @Override
     public int countByRegionCode(Integer enterpriseId, String regionCode) {
-        return 0;
+        TabStoreRegion storeRegion = new TabStoreRegion();
+        storeRegion.setEnterpriseId(enterpriseId);
+        storeRegion.setRegionCode(regionCode);
+        return storeRegionMapper.countBySelective(storeRegion);
     }
 
     @Override
     public int countByRegionName(Integer enterpriseId, String regionName, Integer regionId) {
-        return 0;
+        TabStoreRegion storeRegion = new TabStoreRegion();
+        storeRegion.setEnterpriseId(enterpriseId);
+        storeRegion.setRegionName(regionName);
+        storeRegion.setRegionId(regionId);
+        return storeRegionMapper.countBySelective(storeRegion);
     }
 
     @Override
@@ -56,17 +66,15 @@ public class StoreRegionServiceImpl implements StoreRegionService {
 
     @Override
     public Page<StoreRegionDTO> listStoreRegion(Integer enterpriseId, String search, Integer pageNum, Integer pageSize) {
-        PageHelper.startPage(pageNum, pageSize, " sort desc ");
+        PageHelper.startPage(pageNum, pageSize, " create_time desc ");
         // 查列表
-
-        TabStoreRegion tabGicStoreRegion = storeRegionMapper.selectByPrimaryKey(1);
-        System.out.println(tabGicStoreRegion);
-        return null;
+        List<TabStoreRegion> storeRegionList = storeRegionMapper.listStoreRegion(enterpriseId, search);
+        return PageHelperUtils.changePageHelperToCurrentPage((com.github.pagehelper.Page) storeRegionList, StoreRegionDTO.class);
     }
 
     @Override
-    public List<StoreRegionDTO> listStoreRegion() {
-
-        return null;
+    public List<StoreRegionDTO> listStoreRegion(Integer enterpriseId, String search) {
+        List<TabStoreRegion> storeRegionList = storeRegionMapper.listStoreRegion(enterpriseId, search);
+        return EntityUtil.changeEntityListByOrika(StoreRegionDTO.class, storeRegionList);
     }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/StoreRegionApiServiceImpl.java

@@ -6,6 +6,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.store.service.StoreRegionApiService;
 import com.gic.store.dto.StoreRegionDTO;
 import com.gic.store.service.StoreRegionService;
+import com.gic.store.utils.ErrorCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -27,11 +28,11 @@ public class StoreRegionApiServiceImpl implements StoreRegionApiService {
             // 新增
             int codeCount = storeRegionService.countByRegionCode(enterpriseId, regionCode);
             if (codeCount > 0) {
-                return ServiceResponse.failure(ErrorContent.failure, "域code已存在");
+                return ServiceResponse.failure(ErrorCode.ERROR, "域code已存在");
             }
             int nameCount = storeRegionService.countByRegionName(enterpriseId, regionName, null);
             if (nameCount > 0) {
-                return ServiceResponse.failure(ErrorContent.failure, "域name已存在");
+                return ServiceResponse.failure(ErrorCode.ERROR, "域name已存在");
             }
             regionId = storeRegionService.save(enterpriseId, regionCode, regionName);
         }else {
@@ -52,8 +53,8 @@ public class StoreRegionApiServiceImpl implements StoreRegionApiService {
     }
 
     @Override
-    public ServiceResponse<List<StoreRegionDTO>> listStoreRegion() {
-        List<StoreRegionDTO> list = storeRegionService.listStoreRegion();
+    public ServiceResponse<List<StoreRegionDTO>> listStoreRegion(Integer enterpriseId, String search) {
+        List<StoreRegionDTO> list = storeRegionService.listStoreRegion(enterpriseId, search);
         return ServiceResponse.success(list);
     }
 }

gic-store-service/src/main/resources/mapper/TabStoreBrandMapper.xml

@@ -3,17 +3,18 @@
 <mapper namespace="com.gic.store.dao.mapper.TabStoreBrandMapper">
   <resultMap id="BaseResultMap" type="com.gic.store.entity.TabStoreBrand">
     <id column="store_brand_id" jdbcType="INTEGER" property="storeBrandId" />
+    <result column="store_brand_code" jdbcType="VARCHAR" property="storeBrandCode" />
     <result column="store_brand_name" jdbcType="VARCHAR" property="storeBrandName" />
     <result column="store_brand_category" jdbcType="VARCHAR" property="storeBrandCategory" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="sort" jdbcType="DOUBLE" property="sort" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    store_brand_id, store_brand_name, store_brand_category, sort, enterprise_id, status, 
-    create_time, update_time
+    store_brand_id, store_brand_code, store_brand_name, store_brand_category, sort, enterprise_id, 
+    status, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -26,12 +27,14 @@
     where store_brand_id = #{storeBrandId,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreBrand">
-    insert into tab_store_brand (store_brand_id, store_brand_name, store_brand_category, 
-      sort, enterprise_id, status, 
-      create_time, update_time)
-    values (#{storeBrandId,jdbcType=INTEGER}, #{storeBrandName,jdbcType=VARCHAR}, #{storeBrandCategory,jdbcType=VARCHAR}, 
-      #{sort,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+    insert into tab_store_brand (store_brand_id, store_brand_code, store_brand_name, 
+      store_brand_category, sort, enterprise_id, 
+      status, create_time, update_time
+      )
+    values (#{storeBrandId,jdbcType=INTEGER}, #{storeBrandCode,jdbcType=VARCHAR}, #{storeBrandName,jdbcType=VARCHAR}, 
+      #{storeBrandCategory,jdbcType=VARCHAR}, #{sort,jdbcType=DOUBLE}, #{enterpriseId,jdbcType=INTEGER}, 
+      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreBrand">
     insert into tab_store_brand
@@ -39,6 +42,9 @@
       <if test="storeBrandId != null">
         store_brand_id,
       </if>
+      <if test="storeBrandCode != null">
+        store_brand_code,
+      </if>
       <if test="storeBrandName != null">
         store_brand_name,
       </if>
@@ -65,6 +71,9 @@
       <if test="storeBrandId != null">
         #{storeBrandId,jdbcType=INTEGER},
       </if>
+      <if test="storeBrandCode != null">
+        #{storeBrandCode,jdbcType=VARCHAR},
+      </if>
       <if test="storeBrandName != null">
         #{storeBrandName,jdbcType=VARCHAR},
       </if>
@@ -72,7 +81,7 @@
         #{storeBrandCategory,jdbcType=VARCHAR},
       </if>
       <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
+        #{sort,jdbcType=DOUBLE},
       </if>
       <if test="enterpriseId != null">
         #{enterpriseId,jdbcType=INTEGER},
@@ -91,6 +100,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabStoreBrand">
     update tab_store_brand
     <set>
+      <if test="storeBrandCode != null">
+        store_brand_code = #{storeBrandCode,jdbcType=VARCHAR},
+      </if>
       <if test="storeBrandName != null">
         store_brand_name = #{storeBrandName,jdbcType=VARCHAR},
       </if>
@@ -98,7 +110,7 @@
         store_brand_category = #{storeBrandCategory,jdbcType=VARCHAR},
       </if>
       <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
+        sort = #{sort,jdbcType=DOUBLE},
       </if>
       <if test="enterpriseId != null">
         enterprise_id = #{enterpriseId,jdbcType=INTEGER},
@@ -117,9 +129,10 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.gic.store.entity.TabStoreBrand">
     update tab_store_brand
-    set store_brand_name = #{storeBrandName,jdbcType=VARCHAR},
+    set store_brand_code = #{storeBrandCode,jdbcType=VARCHAR},
+      store_brand_name = #{storeBrandName,jdbcType=VARCHAR},
       store_brand_category = #{storeBrandCategory,jdbcType=VARCHAR},
-      sort = #{sort,jdbcType=INTEGER},
+      sort = #{sort,jdbcType=DOUBLE},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       status = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},

gic-store-service/src/main/resources/mapper/TabStoreRegionMapper.xml

@@ -114,4 +114,30 @@
       enterprise_id = #{enterpriseId,jdbcType=INTEGER}
     where region_id = #{regionId,jdbcType=INTEGER}
   </update>
+
+  <select id="listStoreRegion" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from
+    tab_store_region where status = 1 and enterprise_id = #{enterpriseId}
+    <if test="search != null and search != '' ">
+      and ( region_code like concat('%', #{search}, '%') or region_name like concat('%', #{search}, '%') )
+    </if>
+  </select>
+
+  <select id="countBySelective" parameterType="com.gic.store.entity.TabStoreRegion" resultType="java.lang.Integer">
+    select count(1)
+    from tab_store_region
+    where status = 1
+    <if test="regionCode != null and regionCode != '' ">
+      and region_code = #{regionCode}
+    </if>
+    <if test="regionName != null and regionName != '' ">
+      and region_name = #{regionName}
+    </if>
+    <if test="regionId != null and regionId != '' ">
+      and region_id &lt;&gt; #{regionId}
+    </if>
+  </select>
+  
 </mapper>
\ No newline at end of file

gic-store-web/src/main/java/com/gic/store/web/controller/StoreRegionController.java

 package com.gic.store.web.controller;
 
+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.store.dto.StoreRegionDTO;
 import com.gic.store.service.StoreRegionApiService;
+import com.gic.store.web.qo.PageQO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @author zhiwj
  * @date 2019/6/25
  */
 @RestController
-@RequestMapping("/store-region")
 public class StoreRegionController {
 
     @Autowired
     private StoreRegionApiService storeRegionApiService;
 
-    @RequestMapping("/save")
+    @RequestMapping("/save-store-region")
     public RestResponse saveStoreRegion(String regionCode, String regionName, Integer regionId) {
         Integer enterpriseId = 1111;
         ServiceResponse<Integer> serviceResponse = storeRegionApiService.saveOrUpdateStoreRegion(enterpriseId, regionCode, regionName, regionId);
@@ -29,4 +33,28 @@ public class StoreRegionController {
         }
     }
 
+    @RequestMapping("/page-store-region")
+    public RestResponse pageStoreRegion(String search, PageQO pageQO) {
+        Integer enterpriseId = 1111;
+        ServiceResponse<Page<StoreRegionDTO>> serviceResponse = storeRegionApiService.listStoreRegion(enterpriseId, search, pageQO.getPageNum(), pageQO.getPageSize());
+        if (serviceResponse.isSuccess()) {
+            return RestResponse.success(serviceResponse.getResult());
+        } else {
+            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        }
+    }
+
+    @RequestMapping("/list-store-region")
+    public RestResponse listStoreRegion(String search) {
+        Integer enterpriseId = 1111;
+        ServiceResponse<List<StoreRegionDTO>> serviceResponse = storeRegionApiService.listStoreRegion(enterpriseId, search);
+        if (serviceResponse.isSuccess()) {
+            return RestResponse.success(serviceResponse.getResult());
+        } else {
+            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        }
+    }
+
+
+
 }