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

Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828

Browse Source
This commit is contained in:
zhangchenbiao
2023-08-17 16:44:01 +08:00
parent 0c31dbc907 6803d2c638
commit 1325f48f09
10 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ public class HyPartnerIntentInfoDAO {
public List<PartnerIntentApplyInfoDTO> selectPartnerIntentApplyInfoList(String userId, String workflowStage, String workflowStatus, String keyword, Integer callStatus,
List<String> userPortraitIdList, String lastFollowStartTime, String lastFollowEndTime, List<Long> userChannelIdList){
List<Long> userPortraitIdList, String lastFollowStartTime, String lastFollowEndTime, List<Long> userChannelIdList){
if (StringUtils.isEmpty(userId)){
return new ArrayList<>();
}

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

@@ -138,9 +138,9 @@ public class HyPartnerLineInfoDAO {
}
public List<PrivateSeaLineDTO> getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, String deadlineStart, String deadlineEnd,
String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList,List<String> developmentManagerList){
String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList,List<String> developmentManagerList,List<Long> userPortraitIdList){
return hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd,
intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList);
intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList,userPortraitIdList);
}

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

@@ -42,7 +42,7 @@ public interface HyPartnerIntentInfoMapper {
@Param("workflowStatus") String workflowStatus,
@Param("keyword") String keyword,
@Param("callStatus") Integer callStatus,
@Param("userPortraitIdList") List<String> userPortraitIdList,
@Param("userPortraitIdList") List<Long> userPortraitIdList,
@Param("lastFollowStartTime") String lastFollowStartTime,
@Param("lastFollowEndTime") String lastFollowEndTime,
@Param("userChannelIdList") List<Long> userChannelIdList);

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
View File

@@ -175,7 +175,8 @@ public interface HyPartnerLineInfoMapper {
@Param("storeKeyword") String storeKeyword,
@Param("storeKeywordType") String storeKeywordType,
@Param("userIdList") List<String> userIdList,
@Param("developmentManagerList") List<String> developmentManagerList);
@Param("developmentManagerList") List<String> developmentManagerList,
@Param("userPortraitIdList") List<Long> userPortraitIdList);
/**

5
coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
View File

@@ -547,6 +547,11 @@
#{userId}
</foreach>
</if>
<if test="userPortraitIdList!=null and userPortraitIdList.size>0">
<foreach collection="userPortraitIdList" separator="or" open="and (" close=")" item="userPortraitId">
bi.user_portrait like concat("%,", #{userPortraitId}, ",%")
</foreach>
</if>
<if test="userIdList!=null and userIdList.size==0 and developmentManagerList!=null and developmentManagerList.size>0">
<foreach collection="developmentManagerList" item="developmentManager" open="and hpli.development_manager in (" close=")" separator=",">
#{developmentManager}

2
coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentApplyRequest.java
View File

@@ -18,7 +18,7 @@ public class PartnerIntentApplyRequest {
private String type;
private String keyword;
private Integer callStatus;
private List<String> userPortraitIdList;
private List<Long> userPortraitIdList;
private Long lastFollowStartTime;
private Long lastFollowEndTime;
private List<Long> userChannelIdList;

3
coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java
View File

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @Author suzhuhong
@@ -45,5 +46,7 @@ public class PrivateSeaLineListRequest extends PageInfoRequest {
@ApiModelProperty("【storeCode -推荐店铺编码】、【storeName 推荐店铺名称】、【partnerName 加盟商姓名】或【partnerMobile 手机号】")
private String storeKeywordType;
private List<Long> userPortraitIdList;
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java
View File

@@ -29,7 +29,7 @@ public interface HyPartnerIntentInfoService {
* @return
*/
PageInfo<PartnerIntentApplyInfoVO> getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber,String keyword, Integer callStatus,
List<String> userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List<Long> userChannelIdList);
List<Long> userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List<Long> userChannelIdList);
/**
* 根据线索查询加盟商意向申请信息

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
View File

@@ -81,7 +81,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
@Override
public PageInfo<PartnerIntentApplyInfoVO> getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber,String keyword, Integer callStatus,
List<String> userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List<Long> userChannelIdList) {
List<Long> userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List<Long> userChannelIdList) {
String workflowStatus = "";
if (CommonConstants.PENDING.equals(type)) {
workflowStatus = WorkflowStatusEnum.INTENT_1.getCode();

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -573,7 +573,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
PageInfo privateLineList = new PageInfo(hyPartnerLineInfoDAO.getPrivateSeaLineList(request.getKeyword(), request.getKeywordType(), request.getWorkflowStage(),
request.getWorkflowStatus(), request.getDeadlineStart(), request.getDeadlineEnd(),
intentAreaName, request.getAcceptAdjustType(), request.getStoreKeyword(),
request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds()));
request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds(),request.getUserPortraitIdList()));
List<PrivateSeaLineDTO> list = privateLineList.getList();
if (CollectionUtils.isEmpty(list)){
return new PageInfo<>();