diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java index 9e2ba4d54..8657255a8 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java @@ -36,7 +36,7 @@ public enum WorkflowStageEnum { public static final HashMap getWorkflowStageMap(){ HashMap result = new HashMap<>(); result.put(INTENT.getCode(),WorkflowStatusEnum.INTENT_3.getCode()); - result.put(RESERVATION.getCode(),WorkflowStatusEnum.RESERVATION_8.getCode()); + result.put(RESERVATION.getCode(),WorkflowStatusEnum.RESERVATION_7.getCode()); result.put(INTERVIEW.getCode(),WorkflowStatusEnum.INTERVIEW_7.getCode()); return result; } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/PassLetterUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/PassLetterUtils.java index dc60e93b1..54f8032e6 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/PassLetterUtils.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/PassLetterUtils.java @@ -1,6 +1,5 @@ package com.cool.store.utils; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.RandomUtil; import com.lowagie.text.Document; @@ -73,7 +72,7 @@ public class PassLetterUtils { try { ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray()); PdfReader pdfReader = new PdfReader(inputStream); - String fontFamilyPath = PassLetterUtils.class.getResource("/static/Alibaba-PuHuiTi-Regular.ttf").getPath(); + String fontFamilyPath = PassLetterUtils.class.getResource("/static/Alibaba-PuHuiTi-Regular.ttf").toString(); BaseFont font = BaseFont.createFont(fontFamilyPath, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); PDFUtils.putParagraphAbsolutely(pdfReader, outputStream, x, y, content, font, 19, 1, new Color(255, 82,25)); } catch (Exception e) { diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index 3bf931cae..eb2ae9b31 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -477,7 +477,7 @@ FROM hy_partner_interview WHERE interview_plan_id = #{interviewPlanId} - SELECT t1.id interviewId, t1.id interview_id, t2.id as interviewPlanId, `status`, start_time, end_time, room_id, t1.partner_id partnerId, t1.interviewer interviewerId FROM hy_partner_interview_plan t2 LEFT JOIN hy_partner_interview t1 ON t1.interview_plan_id = t2.id diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 866406d27..62a911d94 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -392,7 +392,7 @@ hpi.record_time as recordTime, hpi.summary as summary, hpi.process_info as processInfo, - hpi.auth_code as processInfo, + hpi.auth_code as authCode, hpi.expiry_date as expiryDate, hpi.pass_pdf_url as passPdfUrl, hpi.pass_image_url as passImageUrl, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java index 2869a4b4a..b0ffe2fc3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java @@ -64,8 +64,9 @@ public class OpenAreaTreeVO { } log.info("1#耗时：{}", System.currentTimeMillis() - startTime); Map> childMap = allTree.stream().collect(Collectors.toMap(k -> k.getId(), v -> v.getChildNode())); - List filterList = allOpenArea.stream().filter(o -> StringUtils.isNotBlank(keyword) && o.getAreaPath().contains(keyword)) - .filter(o->Objects.nonNull(applyFlag) && AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus()) || AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus())).collect(Collectors.toList()); + List filterList = allOpenArea.stream().filter(o -> (StringUtils.isBlank(keyword) || o.getAreaPath().contains(keyword)) + && (Objects.isNull(applyFlag) || AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus()) || AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus()))) + .collect(Collectors.toList()); Map openAreaMap = allOpenArea.stream().collect(Collectors.toMap(k -> k.getId(), Function.identity())); List list = new ArrayList<>(); //向上处理节点 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index 392e151ee..47da93a8d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -184,13 +184,16 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); // 更新线索状态和招商经理 HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(request.getPartnerLineId()); - Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType()); - hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); - if (flag){ - String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(request.getPartnerId(), "intent"); - hyPartnerLineInfoDO.setInvestmentManager(investmentManager); + //是公海线索 才会修改线索状态与招商经理 + if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){ + Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType()); + hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); + if (flag){ + String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(request.getPartnerId(), "intent"); + hyPartnerLineInfoDO.setInvestmentManager(investmentManager); + } + hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); } - hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); } if (StringUtil.isNotBlank(request.getWantShopArea())){ HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(request.getWantShopArea())); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java index b19459c29..f30f469c9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java @@ -8,6 +8,7 @@ import com.cool.store.dto.partner.ApplyReservationProvinceDTO; import com.cool.store.entity.HyOpenAreaInfoDO; import com.cool.store.request.OpenAreaRequest; import com.cool.store.service.OpenAreaService; +import com.cool.store.utils.RedisUtilPool; import com.cool.store.vo.OpenAreaTreeVO; import com.cool.store.vo.OpenAreaVO; import com.cool.store.vo.OpenProvinceVO; @@ -33,7 +34,9 @@ import java.util.stream.Collectors; public class OpenAreaServiceImpl implements OpenAreaService { @Resource - HyOpenAreaInfoDAO hyOpenAreaInfoDAO; + private HyOpenAreaInfoDAO hyOpenAreaInfoDAO; + @Resource + private RedisUtilPool redisUtilPool; @Override @@ -119,10 +122,17 @@ public class OpenAreaServiceImpl implements OpenAreaService { @Override public List searchOpenArea(String keyword,Boolean applyFlag, Boolean flag) { long startTime = System.currentTimeMillis(); - //先查出所有的一级菜单 - List allOpenArea = hyOpenAreaInfoDAO.getAllOpenArea(); + String cacheKey = "allOpenArea"; + String allOpenAreaCache = redisUtilPool.getString(cacheKey); + List allAreaList = null; + if(StringUtils.isBlank(allOpenAreaCache)){ + allAreaList = hyOpenAreaInfoDAO.getAllOpenArea(); + redisUtilPool.setString(cacheKey, JSONObject.toJSONString(allAreaList)); + }else{ + allAreaList = JSONObject.parseArray(allOpenAreaCache, HyOpenAreaInfoDO.class); + } log.info("11耗时：{}", System.currentTimeMillis() - startTime); - return OpenAreaTreeVO.convertTree(allOpenArea, keyword, applyFlag); + return OpenAreaTreeVO.convertTree(allAreaList, keyword, applyFlag); } @Override diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java index dc6be9f2e..ed583acda 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java @@ -247,8 +247,8 @@ public class TestController { } @GetMapping("/searchOpenArea") - public ResponseResult searchOpenArea(@RequestParam(value = "keyword",required = false)String keyword){ - return ResponseResult.success(openAreaService.searchOpenArea(keyword,null,Boolean.FALSE)); + public ResponseResult searchOpenArea(@RequestParam(value = "keyword",required = false)String keyword, @RequestParam(value = "applyFlag",required = false)Boolean applyFlag){ + return ResponseResult.success(openAreaService.searchOpenArea(keyword, applyFlag, Boolean.FALSE)); } }