Merge branch 'developer' into 'master'

Developer

See merge request !15

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

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-05-27 11:19
+ */
+public class StoreTransferDTO implements Serializable {
+    private static final long serialVersionUID = 558941883811192792L;
+
+    /**
+     *
+     */
+    private Integer storeTransferId;
+
+    /**
+     *
+     */
+    private Integer fromStoreId;
+
+    private Integer fromStoreInfoId;
+
+    /**
+     *
+     */
+    private Integer toStoreId;
+
+    private Integer toStoreInfoId;
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     *
+     */
+    private Integer status;
+
+    public Integer getStoreTransferId() {
+        return storeTransferId;
+    }
+
+    public void setStoreTransferId(Integer storeTransferId) {
+        this.storeTransferId = storeTransferId;
+    }
+
+    public Integer getFromStoreId() {
+        return fromStoreId;
+    }
+
+    public void setFromStoreId(Integer fromStoreId) {
+        this.fromStoreId = fromStoreId;
+    }
+
+    public Integer getToStoreId() {
+        return toStoreId;
+    }
+
+    public void setToStoreId(Integer toStoreId) {
+        this.toStoreId = toStoreId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    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 getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getFromStoreInfoId() {
+        return fromStoreInfoId;
+    }
+
+    public void setFromStoreInfoId(Integer fromStoreInfoId) {
+        this.fromStoreInfoId = fromStoreInfoId;
+    }
+
+    public Integer getToStoreInfoId() {
+        return toStoreInfoId;
+    }
+
+    public void setToStoreInfoId(Integer toStoreInfoId) {
+        this.toStoreInfoId = toStoreInfoId;
+    }
+}

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

+package com.gic.store.service;
+
+import com.gic.api.base.commons.ServiceResponse;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-05-27 11:18
+ */
+public interface StoreTransferApiService {
+
+    /**
+     * @Title: save
+     * @Description: 门店成本主体转移
+     * @author zhiwj
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> save(Integer enterpriseId, Integer fromStoreId, Integer toStoreId);
+}

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

+package com.gic.store.dao.mapper;
+
+import com.gic.store.entity.TabStoreTransfer;
+
+public interface TabStoreTransferMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param storeTransferId 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(Integer storeTransferId);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabStoreTransfer record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabStoreTransfer record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param storeTransferId 主键
+     * @return 实体对象
+     */
+    TabStoreTransfer selectByPrimaryKey(Integer storeTransferId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabStoreTransfer record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabStoreTransfer record);
+}
\ No newline at end of file

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

+package com.gic.store.entity;
+
+import java.util.Date;
+
+/**
+ * tab_store_transfer
+ */
+public class TabStoreTransfer {
+    /**
+     * 
+     */
+    private Integer storeTransferId;
+
+    /**
+     * 
+     */
+    private Integer fromStoreId;
+
+    /**
+     * 
+     */
+    private Integer fromStoreInfoId;
+
+    /**
+     * 
+     */
+    private Integer toStoreId;
+
+    /**
+     * 
+     */
+    private Integer toStoreInfoId;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    /**
+     * 
+     */
+    private Integer status;
+
+    public Integer getStoreTransferId() {
+        return storeTransferId;
+    }
+
+    public void setStoreTransferId(Integer storeTransferId) {
+        this.storeTransferId = storeTransferId;
+    }
+
+    public Integer getFromStoreId() {
+        return fromStoreId;
+    }
+
+    public void setFromStoreId(Integer fromStoreId) {
+        this.fromStoreId = fromStoreId;
+    }
+
+    public Integer getFromStoreInfoId() {
+        return fromStoreInfoId;
+    }
+
+    public void setFromStoreInfoId(Integer fromStoreInfoId) {
+        this.fromStoreInfoId = fromStoreInfoId;
+    }
+
+    public Integer getToStoreId() {
+        return toStoreId;
+    }
+
+    public void setToStoreId(Integer toStoreId) {
+        this.toStoreId = toStoreId;
+    }
+
+    public Integer getToStoreInfoId() {
+        return toStoreInfoId;
+    }
+
+    public void setToStoreInfoId(Integer toStoreInfoId) {
+        this.toStoreInfoId = toStoreInfoId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    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 getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}
\ No newline at end of file

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

+package com.gic.store.service;
+
+import com.gic.store.dto.StoreTransferDTO;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-05-27 11:21
+ */
+public interface StoreTransferService {
+    void save(StoreTransferDTO storeTransferDTO);
+}

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

+package com.gic.store.service.impl;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.store.dao.mapper.TabStoreTransferMapper;
+import com.gic.store.dto.StoreTransferDTO;
+import com.gic.store.entity.TabStoreTransfer;
+import com.gic.store.service.StoreTransferService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-05-27 11:22
+ */
+@Service
+public class StoreTransferServiceImpl implements StoreTransferService {
+
+    @Autowired
+    private TabStoreTransferMapper tabStoreTransferMapper;
+
+    @Override
+    public void save(StoreTransferDTO storeTransferDTO) {
+        TabStoreTransfer transfer = EntityUtil.changeEntityByJSON(TabStoreTransfer.class, storeTransferDTO);
+        transfer.setCreateTime(new Date());
+        transfer.setUpdateTime(new Date());
+        transfer.setStatus(1);
+        tabStoreTransferMapper.insertSelective(transfer);
+    }
+}

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -101,7 +101,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             clerkLeader.setClerkType(0);
             clerkService.update(clerkLeader);
             clerkDTO.setClerkType(1);
-        } else {
+        } else if (clerkLeader == null) {
             clerkDTO.setClerkType(1);
         }
 

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreTransferApiServiceImpl.java

+package com.gic.store.service.outer.impl;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.response.EnterpriseServiceResponse;
+import com.gic.store.dto.StoreDTO;
+import com.gic.store.dto.StoreTransferDTO;
+import com.gic.store.service.StoreService;
+import com.gic.store.service.StoreTransferApiService;
+import com.gic.store.service.StoreTransferService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-05-27 11:21
+ */
+@Service("storeTransferApiService")
+public class StoreTransferApiServiceImpl implements StoreTransferApiService {
+
+    @Autowired
+    private StoreTransferService storeTransferService;
+    @Autowired
+    private StoreService storeService;
+
+    @Override
+    public ServiceResponse<Void> save(Integer enterpriseId, Integer fromStoreId, Integer toStoreId) {
+        StoreDTO fromStore = storeService.getById(fromStoreId);
+        if (fromStore == null) {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
+        }
+        StoreDTO toStore = storeService.getById(fromStoreId);
+        if (toStore == null) {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
+        }
+        StoreTransferDTO transferDTO = new StoreTransferDTO();
+        transferDTO.setFromStoreId(fromStore.getStoreId());
+        transferDTO.setFromStoreInfoId(fromStore.getStoreInfoId());
+        transferDTO.setToStoreId(toStore.getStoreId());
+        transferDTO.setToStoreInfoId(toStore.getStoreInfoId());
+        transferDTO.setEnterpriseId(enterpriseId);
+        storeTransferService.save(transferDTO);
+
+        return EnterpriseServiceResponse.success();
+    }
+}

gic-store-service/src/main/resources/dubbo-gic-store-service.xml

@@ -63,6 +63,7 @@
     <dubbo:service interface="com.gic.store.service.StoreTagTmpApiService" ref="storeTagTmpApiService" timeout="6000" />
     <dubbo:service interface="com.gic.store.service.StoreOpenApiService" ref="storeOpenApiService" timeout="6000" />
     <dubbo:service interface="com.gic.store.service.DictApiService" ref="dictApiService" timeout="6000" />
+    <dubbo:service interface="com.gic.store.service.StoreTransferApiService" ref="storeTransferApiService" timeout="6000" />
 
     <dubbo:reference interface="com.gic.weimob.api.service.WeimobStoreSiteService" id="weimobStoreSiteService" timeout="6000"/>
     <dubbo:reference interface="com.gic.enterprise.service.WmStoreSyncLogApiService" id="wmStoreSyncLogApiService" timeout="6000"/>

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

+<?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.gic.store.dao.mapper.TabStoreTransferMapper">
+  <resultMap id="BaseResultMap" type="com.gic.store.entity.TabStoreTransfer">
+    <id column="store_transfer_id" jdbcType="INTEGER" property="storeTransferId" />
+    <result column="from_store_id" jdbcType="INTEGER" property="fromStoreId" />
+    <result column="from_store_info_id" jdbcType="INTEGER" property="fromStoreInfoId" />
+    <result column="to_store_id" jdbcType="INTEGER" property="toStoreId" />
+    <result column="to_store_info_id" jdbcType="INTEGER" property="toStoreInfoId" />
+    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    store_transfer_id, from_store_id, from_store_info_id, to_store_id, to_store_info_id, 
+    enterprise_id, create_time, update_time, status
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_store_transfer
+    where store_transfer_id = #{storeTransferId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_store_transfer
+    where store_transfer_id = #{storeTransferId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.gic.store.entity.TabStoreTransfer">
+    insert into tab_store_transfer (store_transfer_id, from_store_id, from_store_info_id, 
+      to_store_id, to_store_info_id, enterprise_id, 
+      create_time, update_time, status
+      )
+    values (#{storeTransferId,jdbcType=INTEGER}, #{fromStoreId,jdbcType=INTEGER}, #{fromStoreInfoId,jdbcType=INTEGER}, 
+      #{toStoreId,jdbcType=INTEGER}, #{toStoreInfoId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreTransfer">
+    insert into tab_store_transfer
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="storeTransferId != null">
+        store_transfer_id,
+      </if>
+      <if test="fromStoreId != null">
+        from_store_id,
+      </if>
+      <if test="fromStoreInfoId != null">
+        from_store_info_id,
+      </if>
+      <if test="toStoreId != null">
+        to_store_id,
+      </if>
+      <if test="toStoreInfoId != null">
+        to_store_info_id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="storeTransferId != null">
+        #{storeTransferId,jdbcType=INTEGER},
+      </if>
+      <if test="fromStoreId != null">
+        #{fromStoreId,jdbcType=INTEGER},
+      </if>
+      <if test="fromStoreInfoId != null">
+        #{fromStoreInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="toStoreId != null">
+        #{toStoreId,jdbcType=INTEGER},
+      </if>
+      <if test="toStoreInfoId != null">
+        #{toStoreInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabStoreTransfer">
+    update tab_store_transfer
+    <set>
+      <if test="fromStoreId != null">
+        from_store_id = #{fromStoreId,jdbcType=INTEGER},
+      </if>
+      <if test="fromStoreInfoId != null">
+        from_store_info_id = #{fromStoreInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="toStoreId != null">
+        to_store_id = #{toStoreId,jdbcType=INTEGER},
+      </if>
+      <if test="toStoreInfoId != null">
+        to_store_info_id = #{toStoreInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+    </set>
+    where store_transfer_id = #{storeTransferId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.store.entity.TabStoreTransfer">
+    update tab_store_transfer
+    set from_store_id = #{fromStoreId,jdbcType=INTEGER},
+      from_store_info_id = #{fromStoreInfoId,jdbcType=INTEGER},
+      to_store_id = #{toStoreId,jdbcType=INTEGER},
+      to_store_info_id = #{toStoreInfoId,jdbcType=INTEGER},
+      enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      status = #{status,jdbcType=INTEGER}
+    where store_transfer_id = #{storeTransferId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file

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

@@ -93,6 +93,8 @@ public class StoreController extends DownloadUtils {
     private StoreUpdateApiService storeUpdateApiService;
     @Autowired
     private EnterpriseApiService enterpriseApiService;
+    @Autowired
+    private StoreTransferApiService storeTransferApiService;
 
     private Map<Integer, SimpleDateFormat> map = new ConcurrentHashMap<>();
     private Map<Integer, SimpleDateFormat> map1 = new ConcurrentHashMap<>();
@@ -323,6 +325,27 @@ public class StoreController extends DownloadUtils {
         return ResultControllerUtils.commonResult(response);
     }
 
+    /**
+     * 门店转移主体
+     * @param fromStoreId
+     * @param toStoreId
+     * @return
+     */
+    @RequestMapping("/store-transfer")
+    public RestResponse storeTransfer(Integer fromStoreId, Integer toStoreId) {
+        ServiceResponse<Void> serviceResponse = storeTransferApiService.save(UserDetailUtils.getUserDetail().getEnterpriseId(), fromStoreId, toStoreId);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+    @RequestMapping("count-member-store")
+    public RestResponse countMemberInStore(Integer storeId) {
+        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        Integer storeInfoId = storeApiService.getStoreById(enterpriseId, storeId).getResult().getStoreInfoId();
+//        ServiceResponse<Boolean> serviceResponse = storeUpdateApiService.hasMemberByMainStore(enterpriseId, storeInfoId);
+        ServiceResponse<Long> serviceResponse = this.storeUpdateApiService.memberByMainStore(enterpriseId, storeInfoId);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
     @RequestMapping("bulk-update-store")
     public RestResponse bulkUpdateStatus(String storeIds, String value, int type, Integer toStoreId) {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();

gic-store-web/src/main/resources/dubbo-gic-store-web.xml

@@ -47,6 +47,7 @@
     <dubbo:reference interface="com.gic.store.service.StoreTagApiService" id="storeTagApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.store.service.StoreTagTmpApiService" id="storeTagTmpApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.store.service.StoreWidgetApiService" id="storeWidgetApiService" timeout="60000" />
+    <dubbo:reference interface="com.gic.store.service.StoreTransferApiService" id="storeTransferApiService" timeout="60000" />
 
     <dubbo:reference interface="com.gic.enterprise.service.DownloadReportApiService" id="downloadReportApiService" timeout="6000"/>