From 85a329b82e57b8e885b148c9b2f3a3e86fa8de51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 2 Apr 2024 17:01:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/enums/WorkflowSubStageEnum.java | 23 +++-- .../com/cool/store/dao/LineAuditInfoDAO.java | 10 +++ .../com/cool/store/dao/LineInterviewDAO.java | 4 + .../store/mapper/LineAuditInfoMapper.java | 13 +++ .../store/mapper/LineInterviewMapper.java | 2 + .../resources/mapper/LineAuditInfoMapper.xml | 14 +++ .../resources/mapper/LineInterviewMapper.xml | 7 ++ .../store/dto/partner/UserChannelDTO.java | 17 ++++ .../cool/store/vo/IntendProcessTotalVO.java | 44 +++++++++ .../com/cool/store/vo/IntendProcessVO.java | 26 ++++++ .../service/HyPartnerUserChannelService.java | 21 +++++ .../com/cool/store/service/LineService.java | 12 ++- .../store/service/impl/DeskServiceImpl.java | 4 +- .../impl/HyPartnerUserChannelServiceImpl.java | 36 ++++++++ .../store/service/impl/LineServiceImpl.java | 90 +++++++++++++++++++ .../controller/webb/LineInfoController.java | 10 +++ .../webb/UserChannelController.java | 35 ++++++++ 17 files changed, 354 insertions(+), 14 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/partner/UserChannelDTO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/IntendProcessTotalVO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/IntendProcessVO.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerUserChannelService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerUserChannelServiceImpl.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/UserChannelController.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageEnum.java index 23ae40b2b..91c8c073e 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageEnum.java @@ -10,30 +10,33 @@ public enum WorkflowSubStageEnum{ /** * 流程子阶段枚举 */ - INTEND(1, "加盟意向申请", WorkflowSubStageStatusEnum.INTENT_0,"joinIntentionServiceImpl"), - INVITING_INTERVIEWS(5, "邀约面谈", WorkflowSubStageStatusEnum.INVITING_INTERVIEWS_10, "lineInterviewServiceImpl"), - FIRST_INTERVIEWS(10, "一审面试", WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_25, "lineInterviewServiceImpl"), - PAY_DEPOSIT(15, "缴纳意向金", WorkflowSubStageStatusEnum.PAY_DEPOSIT_45, "bankServiceImpl"), - SIGN_INTENT_AGREEMENT(20, "签署意向协议", WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_60, "intentAgreementServiceImpl"), - STORE_EXPERIENCE(25, "门店体验", WorkflowSubStageStatusEnum.STORE_EXPERIENCE_85, "trainingExperienceServiceImpl"), - SECOND_INTERVIEWS(30, "二审面试", WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_100, "lineInterviewServiceImpl"); + INTEND(1, "加盟意向申请", WorkflowSubStageStatusEnum.INTENT_0,"joinIntentionServiceImpl",1), + INVITING_INTERVIEWS(5, "邀约面谈", WorkflowSubStageStatusEnum.INVITING_INTERVIEWS_10, "lineInterviewServiceImpl",2), + FIRST_INTERVIEWS(10, "一审面试", WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_25, "lineInterviewServiceImpl",4), + PAY_DEPOSIT(15, "缴纳意向金", WorkflowSubStageStatusEnum.PAY_DEPOSIT_45, "bankServiceImpl",5), + SIGN_INTENT_AGREEMENT(20, "签署意向协议", WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_60, "intentAgreementServiceImpl",7), + STORE_EXPERIENCE(25, "门店体验", WorkflowSubStageStatusEnum.STORE_EXPERIENCE_85, "trainingExperienceServiceImpl",9), + SECOND_INTERVIEWS(30, "二审面试", WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_100, "lineInterviewServiceImpl",10); private Integer code; private String message; + private Integer progress; + private WorkflowSubStageStatusEnum initStatus; private WorkflowSubStageEnum nextStage; private String clazz; - WorkflowSubStageEnum(Integer code, String message, WorkflowSubStageStatusEnum initStatus, String clazz) { + WorkflowSubStageEnum(Integer code, String message, WorkflowSubStageStatusEnum initStatus, String clazz,Integer progress) { this.code = code; this.message = message; this.initStatus = initStatus; this.clazz = clazz; + this.progress = progress; } @@ -41,6 +44,10 @@ public enum WorkflowSubStageEnum{ return code; } + public Integer getProgress() { + return progress; + } + public String getMessage() { return message; } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineAuditInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineAuditInfoDAO.java index eb79d3184..e1a97d56c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineAuditInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineAuditInfoDAO.java @@ -2,9 +2,12 @@ package com.cool.store.dao; import com.cool.store.entity.LineAuditInfoDO; import com.cool.store.mapper.LineAuditInfoMapper; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; import javax.annotation.Resource; +import java.util.List; /** * @author zhangchenbiao @@ -27,4 +30,11 @@ public class LineAuditInfoDAO { return lineAuditInfoMapper.selectByPrimaryKey(auditId); } + public List getLineAuditInfoList(List auditIds){ + if (CollectionUtils.isEmpty(auditIds)){ + return Lists.newArrayList(); + } + return lineAuditInfoMapper.getLineAuditInfoList(auditIds); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java index f9da90caf..a76616c6f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java @@ -78,4 +78,8 @@ public class LineInterviewDAO { public Integer deleteInterviewInfo(Long interviewId) { return lineInterviewMapper.deleteInterviewInfo(interviewId); } + + public List getInterviewByLineId(Long lineId){ + return lineInterviewMapper.getInterviewByLineId(lineId); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineAuditInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineAuditInfoMapper.java index f3f0548f4..6dfb2e185 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineAuditInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineAuditInfoMapper.java @@ -1,7 +1,20 @@ package com.cool.store.mapper; import com.cool.store.entity.LineAuditInfoDO; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; +import java.util.List; + public interface LineAuditInfoMapper extends Mapper { + + + /** + * getLineAuditInfoList + * @param ids + * @return + */ + List getLineAuditInfoList(@Param("ids") List ids); + + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInterviewMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInterviewMapper.java index 20d0f82c1..867d93611 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInterviewMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInterviewMapper.java @@ -47,4 +47,6 @@ public interface LineInterviewMapper extends Mapper { * @return */ Integer deleteInterviewInfo(@Param("interviewId")Long interviewId); + + List getInterviewByLineId(@Param("lineId") Long lineId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineAuditInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineAuditInfoMapper.xml index 9aefef995..38c6cb611 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineAuditInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineAuditInfoMapper.xml @@ -14,4 +14,18 @@ + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml index 8bb8e6d44..29d254788 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml @@ -105,4 +105,11 @@ update xfsg_line_interview set deleted = '1' where id = #{interviewId} + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/UserChannelDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/UserChannelDTO.java new file mode 100644 index 000000000..2f96a22ec --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/UserChannelDTO.java @@ -0,0 +1,17 @@ +package com.cool.store.dto.partner; + +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/8/10 11:12 + * @Version 1.0 + */ +@Data +public class UserChannelDTO { + + private Long userChannelId; + + private String userChannelName; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/IntendProcessTotalVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/IntendProcessTotalVO.java new file mode 100644 index 000000000..7deeb4321 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/IntendProcessTotalVO.java @@ -0,0 +1,44 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2024/4/2 14:46 + * @Version 1.0 + */ +@Data +public class IntendProcessTotalVO { + + @ApiModelProperty("预估完成天数") + private Integer totalDays; + @ApiModelProperty("预估完成时间") + private String completionTime; + @ApiModelProperty("意向加盟阶段集合") + private List intendProcessVOS; + +} + + + + + + + + + + + + + + + + + + + + + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/IntendProcessVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/IntendProcessVO.java new file mode 100644 index 000000000..107a8f4f9 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/IntendProcessVO.java @@ -0,0 +1,26 @@ +package com.cool.store.vo; + +import com.cool.store.enums.WorkflowSubStageEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author suzhuhong + * @Date 2024/4/2 14:42 + * @Version 1.0 + */ +@Data +public class IntendProcessVO { + + @ApiModelProperty("意向加盟阶段编码") + private Integer code; + @ApiModelProperty("预期时间") + private String ExpectedTime; + @ApiModelProperty("实际时间") + private String ActualTime; + + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerUserChannelService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerUserChannelService.java new file mode 100644 index 000000000..094d5a768 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerUserChannelService.java @@ -0,0 +1,21 @@ +package com.cool.store.service; + +import com.cool.store.dto.partner.UserChannelDTO; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/8/10 11:12 + * @Version 1.0 + */ +public interface HyPartnerUserChannelService { + + /** + * 查询所有的线索来源 + * @return + */ + List queryAllUserChannelList(); + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java index ac2b23381..e50e88727 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java @@ -2,10 +2,7 @@ package com.cool.store.service; import com.cool.store.context.LoginUserInfo; import com.cool.store.request.*; -import com.cool.store.vo.LineInfoVO; -import com.cool.store.vo.LineListVO; -import com.cool.store.vo.PartnerListVO; -import com.cool.store.vo.PublicLineListVO; +import com.cool.store.vo.*; import com.github.pagehelper.PageInfo; /** @@ -68,4 +65,11 @@ public interface LineService { */ Boolean transferInvestmentManager(ChangeInvestmentRequest changeInvestmentRequest, LoginUserInfo userInfo,Boolean transferFlag); + /** + * 线索的各节点情况 + * @param lineId + * @return + */ + IntendProcessTotalVO getIntendProcessTotal(Long lineId); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index a0f2c1e3f..6d9b63c60 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -106,7 +106,7 @@ public class DeskServiceImpl implements DeskService { List wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); Map wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIds); List lineIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getId() != null).map(LineInfoDO::getId).collect(Collectors.toList()); - List interviewByLindIds = lineInterviewDAO.getInterviewByLindIds(lineIds, InterviewTypeEnum.MEET); + List interviewByLindIds = lineInterviewDAO.getInterviewByLindIds(lineIds, InterviewTypeEnum.INTERVIEW); Map interviewDOMap = interviewByLindIds.stream().collect(Collectors.toMap(LineInterviewDO::getLineId, x -> x, (k1, k2) -> k1)); List list = new ArrayList<>(); @@ -138,7 +138,7 @@ public class DeskServiceImpl implements DeskService { List wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); Map wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIds); List lineIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getId() != null).map(LineInfoDO::getId).collect(Collectors.toList()); - List interviewByLindIds = lineInterviewDAO.getInterviewByLindIds(lineIds, InterviewTypeEnum.MEET); + List interviewByLindIds = lineInterviewDAO.getInterviewByLindIds(lineIds, InterviewTypeEnum.SECOND_INTERVIEW); Map interviewDOMap = interviewByLindIds.stream().collect(Collectors.toMap(LineInterviewDO::getLineId, x -> x, (k1, k2) -> k1)); List list = new ArrayList<>(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerUserChannelServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerUserChannelServiceImpl.java new file mode 100644 index 000000000..fbf9d4e60 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerUserChannelServiceImpl.java @@ -0,0 +1,36 @@ +package com.cool.store.service.impl; + +import com.cool.store.dto.partner.UserChannelDTO; +import com.cool.store.entity.HyPartnerUserChannelDO; +import com.cool.store.mapper.HyPartnerUserChannelMapper; +import com.cool.store.service.HyPartnerUserChannelService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/8/10 11:14 + * @Version 1.0 + */ +@Service +public class HyPartnerUserChannelServiceImpl implements HyPartnerUserChannelService { + + @Resource + HyPartnerUserChannelMapper hyPartnerUserChannelMapper; + + @Override + public List queryAllUserChannelList() { + List allUserChannel = hyPartnerUserChannelMapper.getAllUserChannel(); + List result = new ArrayList<>(); + allUserChannel.forEach(x->{ + UserChannelDTO userChannelDTO = new UserChannelDTO(); + userChannelDTO.setUserChannelId(x.getChannelId()); + userChannelDTO.setUserChannelName(x.getChannelName()); + result.add(userChannelDTO); + }); + return result; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index 0e98851f0..ab0386f40 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -59,6 +59,15 @@ public class LineServiceImpl implements LineService { IntentAgreementMapper intentAgreementMapper; @Resource JoinIntentionMapper joinIntentionMapper; + @Resource + LineInterviewDAO lineInterviewDAO; + @Resource + LineAuditInfoDAO lineAuditInfoDAO; + @Resource + LinePayDAO linePayDAO; + @Resource + TrainingExperienceService trainingExperienceService; + @Override public LineInfoVO getLineInfo(Long lineId) { @@ -272,4 +281,85 @@ public class LineServiceImpl implements LineService { return Boolean.TRUE; } + + + @Override + public IntendProcessTotalVO getIntendProcessTotal(Long lineId) { + MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(lineId); + if (memberQuestionDO==null){ + return null; + } + //总天数 + Integer totalDays = 20; + IntendProcessTotalVO intendProcessTotalVO = new IntendProcessTotalVO(); + intendProcessTotalVO.setTotalDays(totalDays); + intendProcessTotalVO.setCompletionTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(memberQuestionDO.getCreateTime(),totalDays))); + + List auditIds = new ArrayList<>(); + if (memberQuestionDO.getAuditId()!=null){ + auditIds.add(memberQuestionDO.getAuditId()); + } + + List interviewList = lineInterviewDAO.getInterviewByLineId(lineId); + auditIds.addAll(interviewList.stream().filter(x->x.getAuditId()!=null).map(LineInterviewDO::getAuditId).collect(Collectors.toList())); + Map interviewDOMap = interviewList.stream().filter(x->x.getAuditId()!=null).collect(Collectors.toMap(k -> k.getInterviewType(), v -> v.getAuditId())); + interviewDOMap.put(10,memberQuestionDO.getAuditId()); + List lineAuditInfoList = lineAuditInfoDAO.getLineAuditInfoList(auditIds); + Map dateMap = lineAuditInfoList.stream().collect(Collectors.toMap(k -> k.getId(), v -> v.getCreateTime())); + + LinePayDO linePay = linePayDAO.getLinePayByLineId(lineId); + SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(memberQuestionDO.getPartnerId(), lineId); + LeaseBaseInfoDO trainingExperience = trainingExperienceService.getTrainingExperience(lineId); + + + HashMap map = new HashMap<>(); + interviewDOMap.forEach((k, v) ->{ + if (k.equals(InterviewTypeEnum.MEET.getCode())){ + map.put(WorkflowSubStageEnum.INVITING_INTERVIEWS.getCode(),dateMap.get(v)); + } + if (k.equals(InterviewTypeEnum.INTERVIEW.getCode())){ + map.put(WorkflowSubStageEnum.FIRST_INTERVIEWS.getCode(),dateMap.get(v)); + } + if (k.equals(InterviewTypeEnum.SECOND_INTERVIEW.getCode())){ + map.put(WorkflowSubStageEnum.SECOND_INTERVIEWS.getCode(),dateMap.get(v)); + } + if (k.equals(10)){ + map.put(WorkflowSubStageEnum.INTEND.getCode(),dateMap.get(v)); + } + }); + if (linePay != null){ + map.put(WorkflowSubStageEnum.PAY_DEPOSIT.getCode(),linePay.getPayTime()); + } + if (signingBaseInfoDO != null){ + map.put(WorkflowSubStageEnum.SIGN_INTENT_AGREEMENT.getCode(),signingBaseInfoDO.getCreateTime()); + } + if (trainingExperience != null){ + map.put(WorkflowSubStageEnum.STORE_EXPERIENCE.getCode(),trainingExperience.getExperienceEndTime()); + } + + List list = new ArrayList<>(); + for (WorkflowSubStageEnum workflowSubStageEnum : WorkflowSubStageEnum.values()) { + IntendProcessVO intend = getIntend(memberQuestionDO.getCreateTime(), workflowSubStageEnum); + if (map.get(workflowSubStageEnum.getCode())!=null){ + intend.setActualTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(map.get(workflowSubStageEnum.getCode()),workflowSubStageEnum.getProgress()))); + } + list.add(intend); + } + intendProcessTotalVO.setIntendProcessVOS(list); + return intendProcessTotalVO; + } + + /** + * 计算预期时间 + * @param startTime + * @param workflowSubStageEnum + * @return + */ + public IntendProcessVO getIntend(Date startTime, WorkflowSubStageEnum workflowSubStageEnum){ + IntendProcessVO intendProcessVO = new IntendProcessVO(); + intendProcessVO.setCode(workflowSubStageEnum.getCode()); + intendProcessVO.setExpectedTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(startTime,workflowSubStageEnum.getProgress()))); + return intendProcessVO; + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java index a825e46c7..bc660bf49 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java @@ -132,4 +132,14 @@ public class LineInfoController { } + @ApiOperation("线索流程进度") + @GetMapping("/getIntendProcess") + @ApiImplicitParams({ + @ApiImplicitParam(name = "lineId", value = "线索id", required = true) + }) + public ResponseResult getIntendProcessTotal(@RequestParam("lineId")Long lineId) { + return ResponseResult.success(lineService.getIntendProcessTotal(lineId)); + } + + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/UserChannelController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/UserChannelController.java new file mode 100644 index 000000000..181af8cc4 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/UserChannelController.java @@ -0,0 +1,35 @@ +package com.cool.store.controller.webb; + +import com.cool.store.dto.partner.UserChannelDTO; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.HyPartnerUserChannelService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/8/10 11:17 + * @Version 1.0 + */ +@RestController +@RequestMapping("/pc/") +@Api(tags = "线索来源") +@Slf4j +public class UserChannelController { + + @Resource + HyPartnerUserChannelService hyPartnerUserChannelService; + + @GetMapping(path = "/queryAllUserChannelList") + @ApiOperation("线索来源列表") + public ResponseResult> queryAllUserChannelList(){ + return ResponseResult.success(hyPartnerUserChannelService.queryAllUserChannelList()); + } +}