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
2024-11-04 19:55:55 +08:00
parent d728c91628
commit 31e6e8a1a2
13 changed files with 95 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
View File

@@ -123,13 +123,13 @@ public class LineInfoDAO {
return lineInfo;
}
public List<LineInfoDO> lineList(LineListRequest lineListRequest,String wantShopAreaName, String userId, List<Long> wantShopAreaIds) {
List<LineInfoDO> lineInfo = lineInfoMapper.lineList(lineListRequest,wantShopAreaName,userId,wantShopAreaIds);
public List<LineInfoDO> lineList(LineListRequest lineListRequest,String wantShopAreaName, String userId, List<Long> regionIds) {
List<LineInfoDO> lineInfo = lineInfoMapper.lineList(lineListRequest,wantShopAreaName,userId,regionIds);
return lineInfo;
}
public List<LineInfoDO> partnerList(PartnerRequest partnerRequest,String wantShopAreaName, String userId, List<Long> wantShopAreaIds) {
List<LineInfoDO> lineInfo = lineInfoMapper.partnerList(partnerRequest,wantShopAreaName,userId,wantShopAreaIds);
public List<LineInfoDO> partnerList(PartnerRequest partnerRequest,String wantShopAreaName, String userId, List<Long> regionIds) {
List<LineInfoDO> lineInfo = lineInfoMapper.partnerList(partnerRequest,wantShopAreaName,userId,regionIds);
return lineInfo;
}

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

@@ -47,12 +47,12 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
List<LineInfoDO> lineList(@Param("request") LineListRequest lineListRequest,
@Param("wantShopAreaName") String wantShopAreaName,
@Param("userId") String userId,
@Param("wantShopAreaIds") List<Long> wantShopAreaIds);
@Param("regionIds") List<Long> regionIds);
List<LineInfoDO> partnerList(@Param("request") PartnerRequest partnerRequest,
@Param("wantShopAreaName") String wantShopAreaName,
@Param("userId") String userId,
@Param("wantShopAreaIds") List<Long> wantShopAreaIds);
@Param("regionIds") List<Long> regionIds);
/**

13
coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
View File

@@ -32,6 +32,7 @@
<result column="deleted" jdbcType="BIT" property="deleted" />
<result column="partner_num" jdbcType="VARCHAR" property="partnerNum" />
<result column="big_region_id" jdbcType="BIGINT" property="bigRegionId" />
<result column="franchise_brand" jdbcType="TINYINT" property="franchiseBrand" />
</resultMap>
<insert id="insertOrUpdate" parameterType="com.cool.store.entity.LineInfoDO" useGeneratedKeys="true" keyProperty="id">
INSERT INTO xfsg_line_info
@@ -437,9 +438,9 @@
<if test="request.investmentManagerUserId != null and request.investmentManagerUserId != ''">
and a.investment_manager = #{request.investmentManagerUserId}
</if>
<if test="wantShopAreaIds !=null and wantShopAreaIds.size>0">
<foreach collection="wantShopAreaIds" item="wantShopAreaId" open="and a.want_shop_area_id in (" close=")" separator=",">
#{wantShopAreaId}
<if test="regionIds !=null and regionIds.size>0">
<foreach collection="regionIds" item="regionId" open="and a.region_id in (" close=")" separator=",">
#{regionId}
</foreach>
</if>
order by a.id desc
@@ -472,9 +473,9 @@
and a.development_manager = #{request.queryUserId}
</if>
</if>
<if test="wantShopAreaIds !=null and wantShopAreaIds.size>0">
<foreach collection="wantShopAreaIds" item="wantShopAreaId" open="and a.want_shop_area_id in (" close=")" separator=",">
#{wantShopAreaId}
<if test="regionIds !=null and regionIds.size>0">
<foreach collection="regionIds" item="regionId" open="and a.region_id in (" close=")" separator=",">
#{regionId}
</foreach>
</if>
order by a.id desc