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

Merge remote-tracking branch 'hsayi/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226

Browse Source
This commit is contained in:
苏竹红
2023-12-19 16:36:25 +08:00
parent 8050c8bc67 77aaffadfb
commit 8676855e6d
7 changed files with 93 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java
View File

@@ -150,4 +150,11 @@ public class HyPartnerExhibitionDAO {
}
return hyPartnerExhibitionMapper.getCloseExhibitionLineIds(exhibitionIds);
}
public List<ExhibitionLineDTO> getLineByExhibitionIds(List<Integer> exhibitionIds) {
if (CollectionUtils.isEmpty(exhibitionIds)){
return new ArrayList<>();
}
return hyPartnerExhibitionMapper.getLineByExhibitionIds(exhibitionIds);
}
}

7
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java
View File

@@ -109,4 +109,11 @@ public interface HyPartnerExhibitionMapper {
* @return
*/
List<Long> getCloseExhibitionLineIds(@Param("exhibitionIds") List<Integer> exhibitionIds);
/**
* 根据展会 id 列表获取会销线索信息
* @param exhibitionIds
* @return
*/
List<ExhibitionLineDTO> getLineByExhibitionIds(List<Integer> exhibitionIds);
}

18
coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
View File

@@ -150,6 +150,7 @@
pu.mobile as mobile
from hy_partner_exhibition hpe left join hy_partner_user_info pu on hpe.partner_id = pu.partner_id
where hpe.participation_status != 7
and hpe.deleted = 0
<if test="exhibitionId != null and exhibitionId!=''">
and hpe.exhibition_id = #{exhibitionId}
</if>
@@ -472,4 +473,21 @@
)
AND participation_status != 7
</select>
<select id="getLineByExhibitionIds" resultType="com.cool.store.dto.exhibition.ExhibitionLineDTO">
select distinct
hpe.partner_id as partnerId,
hpe.partner_line_id as lineId,
hpe.exhibition_id as exhibitionId,
pu.username as partnerName,
pu.mobile as mobile
from hy_partner_exhibition hpe left join hy_partner_user_info pu on hpe.partner_id = pu.partner_id
where hpe.participation_status != 7
and hpe.deleted = 0
and hpe.exhibition_id in (
<foreach collection="exhibitionIds" item="exhibitionId" separator=",">
#{exhibitionId}
</foreach>
)
</select>
</mapper>