From a34c9063dff23d4e3d753d08a796aa9da9d3ccdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 26 Dec 2023 12:11:54 +0800 Subject: [PATCH] =?UTF-8?q?getPartnerInfo=20=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/enums/SignUpStatusEnum.java | 2 +- .../mapper/HyPartnerLineInfoMapper.xml | 1 + .../store/dto/partner/LineInterviewDTO.java | 2 + .../store/vo/exhibition/ExhibitionLineVO.java | 2 + .../vo/exhibition/SignUpExhibitionVO.java | 1 + .../store/vo/partner/PartnerUserBaseVO.java | 3 +- .../store/service/PartnerUserInfoService.java | 2 +- .../impl/PartnerUserInfoServiceImpl.java | 69 +++++++++++++++---- .../exhibition/ExhibitionServiceImpl.java | 1 + .../cool/store/controller/DeskController.java | 5 +- .../store/controller/PartnerController.java | 5 +- 11 files changed, 73 insertions(+), 20 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/SignUpStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/SignUpStatusEnum.java index 1f95a4f69..11cb135fe 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/SignUpStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/SignUpStatusEnum.java @@ -12,7 +12,7 @@ public enum SignUpStatusEnum { Sign_UP_FAIL_1("会销结束","你报名的展会已结束 请确认!"), Sign_UP_FAIL_2("不符合报名条件","该线索已录入系统但不符合报名要求,当前处于【{0}:{1}】状态,建议客户经理以当前状态正常推进,勿占用展会名额。"), Sign_UP_FAIL_3("报名同一个会销组内会销","线索已报名本批次会销组中的“{0}”场次,切勿重复录入"), - Sign_UP_FAIL_4("不符合报名条件—黑名单","该线索已录入系统但不符合报名要求,当前处于【{0}】状态,建议客户经理以当前状态正常推进,勿占用展会名额。"); + Sign_UP_FAIL_4("不符合报名条件—黑名单","该线索已录入系统但不符合报名要求,当前处于【黑名单】状态,建议客户经理以当前状态正常推进,勿占用展会名额。"); private String signUpTitle; private String signUpFailMsg; diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 078908867..4da823da7 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -1027,6 +1027,7 @@