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-16 19:16:28 +08:00
parent c030182b07 4d95784cb3
commit 9b93e91c95
11 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-common/src/main/java/com/cool/store/enums/OperateLogFieldValueEnum.java
View File

@@ -50,7 +50,9 @@ public enum OperateLogFieldValueEnum {
FOLLOW_TASK_ID("followTaskId", "跟进任务id"),
ADD_LABELS("addLabels", "新增标签"),
REMOVE_LABELS("removeLabels", "移除标签"),
CALL_TRANS_NO("transNo", "呼叫请求编号")
CALL_TRANS_NO("transNo", "呼叫请求编号"),
INCOMING_USER_ID("incomingUserId", "接听人用户id"),
INCOMING_USER_NAME("incomingUserName", "接听人用户姓名"),
;

2
coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java
View File

@@ -38,7 +38,7 @@ public enum OperateTypeEnum {
ADD_FOLLOW_LOG("add_follow_log", "新增根据日志", Arrays.asList(FOLLOW_LOG)),
ADD_FOLLOW_TASK("add_follow_task", "新增跟进任务", Arrays.asList(FOLLOW_TASK_ID)),
CALL_UP("call_up", "拨打电话", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, OPERATE_TIME, CALL_TRANS_NO)),
CALL_UP("call_up", "拨打电话", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, OPERATE_TIME, CALL_TRANS_NO,INCOMING_USER_ID,INCOMING_USER_NAME)),
;

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, String userChannelIdList){
List<String> userPortraitIdList, String lastFollowStartTime, String lastFollowEndTime, List<Long> userChannelIdList){
if (StringUtils.isEmpty(userId)){
return new ArrayList<>();
}

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

@@ -45,7 +45,7 @@ public interface HyPartnerIntentInfoMapper {
@Param("userPortraitIdList") List<String> userPortraitIdList,
@Param("lastFollowStartTime") String lastFollowStartTime,
@Param("lastFollowEndTime") String lastFollowEndTime,
@Param("userChannelIdList") String userChannelIdList);
@Param("userChannelIdList") List<Long> userChannelIdList);
/**
* 根据线索ID查询数据

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

@@ -449,7 +449,7 @@
hpl.phone_address as phoneAddress
FROM hy_partner_line_info a
inner JOIN hy_partner_user_info b on a.partner_id = b.partner_id
left join hy_partner_base_info bi on hpli.id = bi.partner_line_id
left join hy_partner_base_info bi on a.id = bi.partner_line_id
LEFT JOIN hy_open_area_info hoai ON hoai.id = b.want_shop_area
LEFT JOIN hy_phone_location hpl ON hpl.phone_number = b.mobile
where a.line_status = 0 and a.deleted = 0

2
coolstore-partner-model/src/main/java/com/cool/store/dto/log/CallUpLogDTO.java
View File

@@ -13,4 +13,6 @@ import lombok.experimental.SuperBuilder;
@SuperBuilder
public class CallUpLogDTO extends LogBasicDTO{
private String transNo;
private String incomingUserId;
private String incomingUserName;
}

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

@@ -0,0 +1,28 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import org.springframework.boot.context.properties.bind.DefaultValue;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2023/8/16 16:57
* @Version 1.0
*/
@Data
@ApiModel
public class PartnerIntentApplyRequest {
private String type;
private String keyword;
private Integer callStatus;
private List<String> userPortraitIdList;
private Long lastFollowStartTime;
private Long lastFollowEndTime;
private List<Long> userChannelIdList;
private Integer pageNumber = 1;
private Integer pageSize = 10;
}

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, String userChannelIdList);
List<String> userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List<Long> userChannelIdList);
/**
* 根据线索查询加盟商意向申请信息

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

@@ -6,11 +6,13 @@ import com.alibaba.fastjson.JSON;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.EnterpriseUserDAO;
import com.cool.store.dao.HyPartnerUserInfoDAO;
import com.cool.store.dto.call.CallUpDTO;
import com.cool.store.dto.log.CallUpLogDTO;
import com.cool.store.dto.log.EntrustOthersDTO;
import com.cool.store.entity.CallRecordDO;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.entity.HyPartnerUserInfoDO;
import com.cool.store.enums.CallStatusEnum;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.OperateTypeEnum;
@@ -18,6 +20,7 @@ import com.cool.store.exception.ApiException;
import com.cool.store.handler.WebSocketServer;
import com.cool.store.mapper.CallRecordMapper;
import com.cool.store.mapper.HyOutboundMobileMapper;
import com.cool.store.mapper.HyPartnerUserInfoMapper;
import com.cool.store.request.CallFinishBackReq;
import com.cool.store.request.CallRecordBackReq;
import com.cool.store.request.CallUpReq;
@@ -33,6 +36,7 @@ import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Objects;
/**
* @Author: young.yu
@@ -50,7 +54,7 @@ public class CallServiceImpl implements CallService {
private HyOutboundMobileMapper hyOutboundMobileMapper;
@Autowired
private EnterpriseUserDAO enterpriseUserDAO;
private HyPartnerUserInfoDAO hyPartnerUserInfoDAO;
@Autowired
private LogService logService;
@@ -91,8 +95,12 @@ public class CallServiceImpl implements CallService {
//记录日志
LoginUserInfo operator = CurrentUserHolder.getUser();
CallUpLogDTO log = CallUpLogDTO.builder().operateUserId(operator.getUserId()).operateUsername(operator.getName())
.operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC))
.operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)).incomingUserId(request.getIncomingUserId())
.transNo(transNo).build();
HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(request.getIncomingUserId());
if(!Objects.isNull(hyPartnerUserInfoDO)){
log.setIncomingUserName(hyPartnerUserInfoDO.getUsername());
}
logService.recordBizLog(operator,Long.valueOf(request.getLineId()), OperateTypeEnum.CALL_UP,log);
return transNo;

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

@@ -81,8 +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, String userChannelIdList) {
PartnerIntentApplyInfoVO partnerIntentApplyInfoVO = new PartnerIntentApplyInfoVO();
List<String> userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List<Long> userChannelIdList) {
String workflowStatus = "";
if (CommonConstants.PENDING.equals(type)) {
workflowStatus = WorkflowStatusEnum.INTENT_1.getCode();

21
coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
View File

@@ -99,25 +99,12 @@ public class DeskController {
}
@GetMapping(path = "/queryIntentApplyList")
@PostMapping(path = "/queryIntentApplyList")
@ApiOperation("招商经理视角===意向申请审核列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "类型 待处理-pending 待跟进-follow", required = false),
@ApiImplicitParam(name = "pageNumber", value = "1", required = false),
@ApiImplicitParam(name = "pageSize", value = "10", required = false),
})
public ResponseResult<PageInfo<PartnerIntentApplyInfoVO>> queryIntentApplyList(@RequestParam(value = "type",required = false)String type,
@RequestParam(value = "keyword",required = false)String keyword,
@RequestParam(value = "callStatus",required = false)Integer callStatus,
@RequestParam(value = "userPortraitIdList",required = false)List<String> userPortraitIdList,
@RequestParam(value = "lastFollowStartTime",required = false)Long lastFollowStartTime,
@RequestParam(value = "lastFollowEndTime",required = false)Long lastFollowEndTime,
@RequestParam(value = "userChannelIdList",required = false)String userChannelIdList,
@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){
public ResponseResult<PageInfo<PartnerIntentApplyInfoVO>> queryIntentApplyList(@RequestBody PartnerIntentApplyRequest req){
String userId = CurrentUserHolder.getUserId();
return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyList(userId,type,pageSize,pageNumber,keyword,callStatus,userPortraitIdList,
lastFollowStartTime,lastFollowEndTime,userChannelIdList));
return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyList(userId,req.getType(),req.getPageSize(),req.getPageNumber(),req.getKeyword(),req.getCallStatus(),req.getUserPortraitIdList(),req.getLastFollowStartTime()
,req.getLastFollowEndTime(),req.getUserChannelIdList()));
}