From 26047a95bdff82c06b6faf031e9ea5ed2dd54ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 25 Jul 2023 10:21:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A7=BB=E5=87=BA=E9=BB=91=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/HyPartnerLineInfoServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 5c94a3bd5..419aa4624 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -315,10 +315,17 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); + List lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(hyPartnerLineInfo.getPartnerId()); HyPartnerLineInfoDO newHyPartnerLineInfoDO = new HyPartnerLineInfoDO(); newHyPartnerLineInfoDO.setPartnerId(hyPartnerLineInfo.getPartnerId()); newHyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); newHyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); + log.info("lineFollowHistoryList_1:{}",JSONObject.toJSONString(lineFollowHistoryList)); + if (CollectionUtils.isNotEmpty(lineFollowHistoryList)){ + String investmentManager = lineFollowHistoryList.get(0).getInvestmentManager(); + newHyPartnerLineInfoDO.setInvestmentManager(investmentManager); + status = LineStatusEnum.PRIVATE_SEAS.getCode(); + } newHyPartnerLineInfoDO.setLineStatus(status); hyPartnerLineInfoDAO.insertSelective(newHyPartnerLineInfoDO); From 97cfac0c5af64915b0b42b9eeda5b4736c4f691a Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Tue, 25 Jul 2023 10:49:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=87=BD=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/utils/PDFUtils.java | 2 ++ .../cool/store/service/impl/FlowServiceImpl.java | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java index 0bb7375f2..0f9d02d16 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java @@ -135,6 +135,8 @@ public class PDFUtils { * @param inputStream pdf 输入流 * @param scale 缩放比例 */ + //不再将通过函转为图片 + @Deprecated public static ByteArrayOutputStream pdf2Img(InputStream inputStream, float scale) { org.icepdf.core.pobjects.Document document = new org.icepdf.core.pobjects.Document(); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index bf62ccd95..5d732041f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -407,12 +407,12 @@ public class FlowServiceImpl implements FlowService { //生成的 pdf 通过函内存输入流 ByteArrayInputStream inputStream = new ByteArrayInputStream(pdfOut.toByteArray()); String passPdfUrl = ossServer.uploadFileServer(inputStream, "passLetter/" + passCode + ".pdf"); - //转换为图片 - inputStream.reset(); - ByteArrayOutputStream imageOut = PDFUtils.pdf2Img(inputStream, 2.0f); - inputStream = new ByteArrayInputStream(imageOut.toByteArray()); + //不再转换为图片 + //inputStream.reset(); + //ByteArrayOutputStream imageOut = PDFUtils.pdf2Img(inputStream, 2.0f); + //inputStream = new ByteArrayInputStream(imageOut.toByteArray()); //上传 OSS - String passImageUrl = ossServer.uploadFileServer(inputStream, "passLetter/" + passCode + ".png"); + //String passImageUrl = ossServer.uploadFileServer(inputStream, "passLetter/" + passCode + ".png"); //计算有效期截止日期 Date expiryDate = DateUtil.offsetDay(passTime, 60); expiryDate = DateUtil.endOfDay(expiryDate); @@ -422,11 +422,11 @@ public class FlowServiceImpl implements FlowService { interviewDO.setPassTime(passTime); interviewDO.setExpiryDate(DateUtil.formatDateTime(expiryDate)); interviewDO.setPassPdfUrl(passPdfUrl); - interviewDO.setPassImageUrl(passImageUrl); + //interviewDO.setPassImageUrl(passImageUrl); hyPartnerInterviewMapper.updateByPrimaryKeySelective(interviewDO); inputStream.close(); pdfOut.close(); - imageOut.close(); + //imageOut.close(); } catch (Exception e) { log.error("资格面试通过函生成失败 e{}", e.getMessage()); throw new ServiceException("通过函生成失败！"); From f3e95c6032f20d6ef7864366a3d186a3fa0cb6ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Tue, 25 Jul 2023 11:54:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/NoticeService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java index cf20e055b..8d04259fa 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java @@ -22,7 +22,7 @@ import java.util.List; @Slf4j @Service public class NoticeService { - @Value("${feishu.notice.link.url:null}") + @Value("${feishu.notice.link.url}") private String linkUrl; @Autowired private ISVHttpRequest isvHttpRequest; From ea9199240c6b5b9e4b0edc7db6c56d7e185b7f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 25 Jul 2023 13:35:33 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A7=BB=E5=87=BA=E9=BB=91=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 0aea443ad..6dba31838 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -52,7 +52,7 @@ #{record.workflowStage}, #{record.workflowStatus}, #{record.lineStatus}, - #{record.investmentManager} + #{record.investmentManager}) From 6569ee131301fb07ca5b9089236808290969ddcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 25 Jul 2023 13:44:20 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 6dba31838..01b32777e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -579,7 +579,7 @@ From 46b80b379f8fb614065ee05f8ea7a937cf528b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 25 Jul 2023 13:49:54 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 01b32777e..f1614b231 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -580,6 +580,11 @@ SELECT partner_id, IFNULL(COUNT(1), 0) AS followCount FROM hy_partner_line_info where (deleted = 1 or (deleted=0 and line_status=0 and close_time is not null and investment_manager is not null)) + + + #{partnerId} + + GROUP BY partner_id;