suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

门店转让记录,修改门店招商专员/督导接口

Browse Source
This commit is contained in:
shuo.wang
2025-01-08 17:32:54 +08:00
parent 96f8ad4a7e
commit 4acd471fbd
19 changed files with 332 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/TransferLogDAO.java
View File

@@ -24,11 +24,11 @@ public class TransferLogDAO {
}
public List<TransferLogDTO> getTransferLogList(Long lindId){
public List<TransferLogDTO> getTransferLogList(Long lindId,Integer lineShopType){
if (lindId == null){
return null;
}
return transferLogMapper.getTransferLogList(lindId);
return transferLogMapper.getTransferLogList(lindId,lineShopType);
}

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/TransferLogMapper.java
View File

@@ -14,7 +14,7 @@ public interface TransferLogMapper extends Mapper<TransferLogDO> {
* @param lindId
* @return
*/
List<TransferLogDTO> getTransferLogList(@Param("lindId") Long lindId);
List<TransferLogDTO> getTransferLogList(@Param("lindId") Long lindId,@Param("lineShopType")Integer lineShopType);
}

4
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -26,13 +26,15 @@
<result column="want_shop_area_id" jdbcType="BIGINT" property="wantShopAreaId"/>
<result column="investment_manager" jdbcType="VARCHAR" property="investmentManager"/>
<result column="shop_status" jdbcType="TINYINT" property="shopStatus"/>
<result column="create_user_id" jdbcType="VARCHAR" property="createUserId"/>
<result column="update_user_id" jdbcType="VARCHAR" property="updateUserId"/>
</resultMap>
<sql id="allColumn">
id, region_id, line_id, partner_id, point_id, shop_name,
shop_code, store_num, shop_manager_user_id, supervisor_user_id,
plan_open_time, cur_progress, shop_type, shop_stage, deleted, create_time, update_time,
join_mode,detail_address,franchise_brand,development_manager,want_shop_area_id,investment_manager,shop_status
join_mode,detail_address,franchise_brand,development_manager,want_shop_area_id,investment_manager,shop_status,create_user_id,update_user_id
</sql>
<insert id="batchAddShop" useGeneratedKeys="true" keyProperty="id" keyColumn="id">

59
coolstore-partner-dao/src/main/resources/mapper/TransferLogMapper.xml
View File

@@ -1,36 +1,37 @@
<?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.cool.store.mapper.TransferLogMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.TransferLogDO">
<!--
WARNING - @mbg.generated
-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="line_id" jdbcType="BIGINT" property="lineId" />
<result column="partner_id" jdbcType="BIGINT" property="partnerId" />
<result column="from_user_id" jdbcType="VARCHAR" property="fromUserId" />
<result column="to_user_id" jdbcType="VARCHAR" property="toUserId" />
<result column="type" jdbcType="TINYINT" property="type" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
<result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
</resultMap>
<resultMap id="BaseResultMap" type="com.cool.store.entity.TransferLogDO">
<!--
WARNING - @mbg.generated
-->
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="line_id" jdbcType="BIGINT" property="lineId"/>
<result column="partner_id" jdbcType="BIGINT" property="partnerId"/>
<result column="from_user_id" jdbcType="VARCHAR" property="fromUserId"/>
<result column="to_user_id" jdbcType="VARCHAR" property="toUserId"/>
<result column="type" jdbcType="TINYINT" property="type"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="create_user_id" jdbcType="VARCHAR" property="createUserId"/>
<result column="update_user_id" jdbcType="VARCHAR" property="updateUserId"/>
<result column="line_shop_type" jdbcType="TINYINT" property="lineShopType"/>
</resultMap>
<select id="getTransferLogList" resultType="com.cool.store.dto.TransferLogDTO">
select
b.user_id as fromUserId ,
b.name as fromUserName ,
b.mobile as fromUserMobile ,
c.user_id as toUserId ,
c.name as toUserName ,
c.mobile as toUserMobile ,
a.type as type
from
xfsg_transfer_log a
left join enterprise_user_${enterpriseId} b on b.user_id = a.from_user_id
left join enterprise_user_${enterpriseId} c on c.user_id = a.to_user_id where a.line_id = #{lindId}
</select>
<select id="getTransferLogList" resultType="com.cool.store.dto.TransferLogDTO">
select b.user_id as fromUserId,
b.name as fromUserName,
b.mobile as fromUserMobile,
c.user_id as toUserId,
c.name as toUserName,
c.mobile as toUserMobile,
a.type as type,
a.line_shop_type as lineShopType
from xfsg_transfer_log a
left join enterprise_user_${enterpriseId} b on b.user_id = a.from_user_id
left join enterprise_user_${enterpriseId} c on c.user_id = a.to_user_id
where a.line_id = #{lindId} and a.line_shop_type = #{lineShopType}
</select>
</mapper>