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

Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust

Browse Source
This commit is contained in:
苏竹红
2024-10-12 19:14:30 +08:00
parent fd0352c208 0b528c4dee
commit 3900475c48
12 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-dao/src/main/java/com/cool/store/dao/OperationLogDAO.java
View File

@@ -70,11 +70,11 @@ public class OperationLogDAO {
}
return operationLogMapper.getBySubStageStatusAndUser(userId,shopSubStageStatus);
}
public List<OperationLogDO> getByShopSubStage(Long shopId, List<Integer> shopSubStageStatusList, List<Integer> types) {
if (Objects.isNull(shopId) || CollectionUtils.isEmpty(shopSubStageStatusList)) {
public List<OperationLogDO> getByShopSubStage(Long shopId, List<Integer> shopSubStageList, List<Integer> types) {
if (Objects.isNull(shopId) || CollectionUtils.isEmpty(shopSubStageList)) {
return null;
}
return operationLogMapper.getByShopSubStage(shopId,shopSubStageStatusList,types);
return operationLogMapper.getByShopSubStage(shopId,shopSubStageList,types);
}
public Integer updateByPrimaryKeySelective(OperationLogDO operationLogDO) {

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

@@ -290,11 +290,11 @@ public class ShopStageInfoDAO {
}
return shopStageInfoMapper.getSubStageList(shopIds,shopSubStage);
}
public List<ShopStageInfoDO> getSubStages(List<Long> shopIds, Integer shopSubStageStatus){
public List<ShopStageInfoDO> getSubStages(List<Long> shopIds, Integer shopSubStage){
if(CollectionUtils.isEmpty(shopIds) ){
return Collections.emptyList();
}
return shopStageInfoMapper.getSubStages(shopIds,shopSubStageStatus);
return shopStageInfoMapper.getSubStages(shopIds,shopSubStage);
}
/**

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

@@ -20,7 +20,7 @@ public interface OperationLogMapper extends Mapper<OperationLogDO> {
List<OperationLogDO> getBySubStageStatusEnumAndsStatus(@Param("shopId") Long shopId, @Param("shopSubStageStatus") Integer shopSubStageStatus, @Param("type") Integer type);
List<OperationLogDO> getByShopSubStage(@Param("shopId") Long shopId, @Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList, @Param("types") List<Integer> types);
List<OperationLogDO> getByShopSubStage(@Param("shopId") Long shopId, @Param("shopSubStageList") List<Integer> shopSubStageList, @Param("types") List<Integer> types);
Long batchAddOperationLog(@Param("list") List<OperationLogDO> operationLogDO) ;

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

@@ -134,7 +134,7 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
@Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList,
@Param("investmentUserId") String investmentUserId, @Param("authRegionIds") List<String> authRegionIds);
List<ShopStageInfoDO> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
List<ShopStageInfoDO> getSubStages(@Param("shopIds") List<Long> shopIds,@Param("shopSubStageStatus") Integer shopSubStageStatus);
List<ShopStageInfoDO> getSubStages(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
/**
* 获取线索处在某个阶段的某个状态的店铺数量

8
coolstore-partner-dao/src/main/resources/mapper/OperationLogMapper.xml
View File

@@ -52,11 +52,11 @@
select *
from xfsg_operation_log
where shop_id = #{shopId}
<if test="shopSubStageStatusList !=null and shopSubStageStatusList.size()>0">
and shop_sub_stage_status in
<foreach collection="shopSubStageStatusList" index="index" item="shopSubStageStatus" open="(" close=")"
<if test="shopSubStageList !=null and shopSubStageList.size()>0">
and shop_sub_stage in
<foreach collection="shopSubStageList" index="index" item="shopSubStage" open="(" close=")"
separator=",">
#{shopSubStageStatus}
#{shopSubStage}
</foreach>
</if>
<if test="types !=null and types.size()>0">

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

@@ -342,7 +342,7 @@
<select id="getSubStages" resultType="com.cool.store.entity.ShopStageInfoDO">
select *
from xfsg_shop_stage_info
where 1=1
where is_terminated = 1
<if test="shopIds !=null and shopIds.size()>0">
and shop_id in
<foreach collection="shopIds" item="shopId" index="index" open="(" separator="," close=")">
@@ -350,7 +350,7 @@
</foreach>
</if>
<if test="shopSubStage !=null">
and shop_sub_stage_status =#{shopSubStageStatus}
and shop_sub_stage =#{shopSubStage}
</if>
</select>
</mapper>