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

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

Browse Source
This commit is contained in:
guohb
2024-04-23 17:01:24 +08:00
parent 6490d633c5 fd7604eef0
commit 50a9b221de
7 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,8 +125,8 @@ public class LineInfoDAO {
return lineInfo;
}
public List<LineInfoDO> publicLineList(PublicLineListRequest publicLineListRequest) {
List<LineInfoDO> lineInfo = lineInfoMapper.publicLineList(publicLineListRequest);
public List<LineInfoDO> publicLineList(PublicLineListRequest publicLineListRequest,Boolean publicFlag) {
List<LineInfoDO> lineInfo = lineInfoMapper.publicLineList(publicLineListRequest,publicFlag);
return lineInfo;
}

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

@@ -55,7 +55,7 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
* @param publicLineListRequest
* @return
*/
List<LineInfoDO> publicLineList(@Param("request") PublicLineListRequest publicLineListRequest);
List<LineInfoDO> publicLineList(@Param("request") PublicLineListRequest publicLineListRequest, @Param("publicFlag") Boolean publicFlag);
/**
* 根据lineId判断是更新还是插入

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

@@ -436,14 +436,20 @@
<select id="publicLineList" resultMap="BaseResultMap">
select * from xfsg_line_info
where deleted = 0 and line_status = 0 and join_status = 0
<if test="publicFlag">
and investment_manager is not null
</if>
<if test="publicFlag==false">
and investment_manager is null
</if>
<if test="request.userName != null and request.username!=''">
and username = #{request.userName}
and username like concat('%',#{request.userName},'%')
</if>
<if test="request.mobile != null and request.mobile!=''">
and mobile = #{request.mobile}
and mobile like concat('%', #{request.mobile},'%')
</if>
<if test="request.keyword != null and request.keyword!=''">
and (username like #{request.keyword} or mobile like #{request.keyword})
and (username like concat('%',#{request.keyword},'%') or mobile like concat('%', #{request.keyword},'%'))
</if>
<if test="request.lineSource != null">
and line_source = #{request.lineSource}

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

@@ -36,7 +36,7 @@ public interface LineService {
* @param loginUserInfo
* @return
*/
PageInfo<PublicLineListVO> getPublicLineList(PublicLineListRequest publicLineListRequest, LoginUserInfo loginUserInfo);
PageInfo<PublicLineListVO> getPublicLineList(PublicLineListRequest publicLineListRequest, LoginUserInfo loginUserInfo ,Boolean publicFlag);
/**

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
View File

@@ -168,9 +168,9 @@ public class LineServiceImpl implements LineService {
}
@Override
public PageInfo<PublicLineListVO> getPublicLineList(PublicLineListRequest publicLineListRequest, LoginUserInfo loginUserInfo) {
public PageInfo<PublicLineListVO> getPublicLineList(PublicLineListRequest publicLineListRequest, LoginUserInfo loginUserInfo, Boolean publicFlag) {
PageHelper.startPage(publicLineListRequest.getPageNum(), publicLineListRequest.getPageSize());
List<LineInfoDO> lineInfoDOS = lineInfoDAO.publicLineList(publicLineListRequest);
List<LineInfoDO> lineInfoDOS = lineInfoDAO.publicLineList(publicLineListRequest,publicFlag);
PageInfo page = new PageInfo(lineInfoDOS);
Map<Long, HyPartnerLabelDO> userPortraitMap = deskService.getUserPortraitMap(lineInfoDOS);
List<Long> wantShopAreaIdList = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());

12
coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java
View File

@@ -6,8 +6,7 @@ import com.cool.store.constants.CommonConstants;
import com.cool.store.dao.*;
import com.cool.store.dto.wx.*;
import com.cool.store.entity.*;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.UserChannelEnum;
import com.cool.store.enums.*;
import com.cool.store.exception.ServiceException;
import com.cool.store.http.WechatRest;
import com.cool.store.mapper.HyPartnerUserChannelMapper;
@@ -123,6 +122,15 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
}
hyPartnerUserInfoDO.setUserChannelId(channelId);
hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO);
//授权的时候 新增线索 放到公海
LineInfoDO lineInfoDO = new LineInfoDO();
lineInfoDO.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode());
lineInfoDO.setWorkflowSubStage(WorkflowSubStageEnum.INTEND.getCode());
lineInfoDO.setMobile(hyPartnerUserInfoDO.getMobile());
lineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode());
lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_0.getCode());
lineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId());
lineInfoDAO.insertOrUpdate(lineInfoDO);
}else {
hyPartnerUserInfoDO.setOpenid(openid);
hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);

11
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java
View File

@@ -62,9 +62,16 @@ public class LineInfoController {
@ApiOperation("公海线索")
@PostMapping("/getPublicLineList")
public ResponseResult<PageInfo<PublicLineListVO>> getTeamLineList(@RequestBody PublicLineListRequest publicLineListRequest) {
public ResponseResult<PageInfo<PublicLineListVO>> getPublicLineList(@RequestBody PublicLineListRequest publicLineListRequest) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(lineService.getPublicLineList(publicLineListRequest,user));
return ResponseResult.success(lineService.getPublicLineList(publicLineListRequest,user,Boolean.TRUE));
}
@ApiOperation("待分配线索")
@PostMapping("/getAssignedLineList")
public ResponseResult<PageInfo<PublicLineListVO>> getAssignedLineList(@RequestBody PublicLineListRequest publicLineListRequest) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(lineService.getPublicLineList(publicLineListRequest,user,Boolean.FALSE));
}
@ApiOperation("我负责的加盟商")