From e4d340382f62cc08df1fcdc8fc26dba635806aea Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Mon, 18 Dec 2023 15:10:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?800=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/mapper/DingdingUserMapper.java | 2 ++ .../store/request/CreateQualifyVerifyReq.java | 12 ++++++++--- .../request/RpcCreateQualifyVerifyReq.java | 11 ++++++++++ .../store/service/impl/FlowServiceImpl.java | 20 +++++++++++-------- .../cool/store/controller/FlowController.java | 2 -- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DingdingUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DingdingUserMapper.java index b47279277..f1b347b6c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DingdingUserMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DingdingUserMapper.java @@ -1,11 +1,13 @@ package com.cool.store.mapper; import com.cool.store.entity.DingdingUserDO; +import org.apache.ibatis.annotations.Mapper; /** * @author zhangchenbiao * @date 2023-06-15 10:03 */ +@Mapper public interface DingdingUserMapper { /** * diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java index 3306bb895..9743b1926 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java @@ -2,13 +2,10 @@ package com.cool.store.request; import com.cool.store.request.data.flow.IdName; import com.cool.store.request.data.flow.KeyText; -import com.cool.store.request.data.flow.SkrRelshipProve; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; - /** * @Author: young.yu * @Date: 2023-06-14 14:18 @@ -38,6 +35,15 @@ public class CreateQualifyVerifyReq { @ApiModelProperty(value = "加盟商类型", required = true) private KeyText fraType; + @ApiModelProperty(value = "是否是新加盟商", example = "YES") + private KeyText whetherNewFranchisee; + + @ApiModelProperty(value = "是否需要设备分期", example = "yes") + private KeyText needEquipmentInstallment; + + @ApiModelProperty(value = "加盟费支付方式 分期支付 yes；全款支付 no", example = "yes") + private KeyText fraFeePayMethod; + @ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {HSAY: 沪上阿姨} 2: {HSLIGHT: 沪上阿姨（轻享）}") private KeyText innerbrandtype; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java index 8fa4d399d..d4f361955 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java @@ -3,6 +3,7 @@ package com.cool.store.request; import com.cool.store.request.data.flow.IdName; import com.cool.store.request.data.flow.KeyText; import com.cool.store.request.data.flow.SkrRelshipProve; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -61,6 +62,16 @@ public class RpcCreateQualifyVerifyReq { @ApiModelProperty(value = "加盟商类型", required = true) private KeyText fraType; + @ApiModelProperty(value = "是否是新加盟商", example = "YES") + @JsonProperty("IsNewFranchisee") + private KeyText IsNewFranchisee; + + @ApiModelProperty(value = "是否需要设备分期", example = "yes") + private KeyText needEquipmentInstallment; + + @ApiModelProperty(value = "加盟费支付方式 分期支付 yes；全款支付 no", example = "yes") + private KeyText fraFeePayMethod; + @ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {HSAY: 沪上阿姨} 2: {HSLIGHT: 沪上阿姨（轻享）}") private KeyText innerbrandtype; 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 314dde535..1e1e82a8c 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 @@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.cool.store.constants.CommonConstants; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.EnterpriseUserDAO; @@ -13,7 +12,6 @@ import com.cool.store.dao.HyInterviewDAO; import com.cool.store.dao.HyPartnerBaseInfoDAO; import com.cool.store.dto.log.CreateQualifyVerifyDTO; import com.cool.store.dto.log.LogBasicDTO; -import com.cool.store.dto.mdm.AccessTokenDTO; import com.cool.store.dto.response.DictResultDTO; import com.cool.store.dto.response.MDMResultDTO; import com.cool.store.entity.*; @@ -24,11 +22,18 @@ import com.cool.store.http.EventCenterHttpRequest; import com.cool.store.http.MDMHttpRequest; import com.cool.store.mapper.*; import com.cool.store.oss.OSSServer; -import com.cool.store.request.*; -import com.cool.store.request.data.flow.KeyText; +import com.cool.store.request.CloseFollowRequest; +import com.cool.store.request.CreateQualifyVerifyReq; +import com.cool.store.request.QualificationCallbackReq; +import com.cool.store.request.RpcCreateQualifyVerifyReq; import com.cool.store.request.data.flow.SkrRelshipProve; -import com.cool.store.service.*; -import com.cool.store.utils.*; +import com.cool.store.service.FlowService; +import com.cool.store.service.HyPartnerLineInfoService; +import com.cool.store.service.LogService; +import com.cool.store.service.WechatMiniAppService; +import com.cool.store.utils.CoolDateUtils; +import com.cool.store.utils.PassLetterUtils; +import com.cool.store.utils.RedisUtilPool; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -38,8 +43,6 @@ import org.springframework.core.io.ByteArrayResource; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -123,6 +126,7 @@ public class FlowServiceImpl implements FlowService { dataBody.setFraSource(request.getFraSource()); //copy properties BeanUtil.copyProperties(request, dataBody); + dataBody.setIsNewFranchisee(request.getWhetherNewFranchisee()); //日期格式问题 if (request.getWantSignTime().endsWith("00:00:00")) { dataBody.setIntendedSignDate(request.getWantSignTime()); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java index 820f92f4a..191d251a5 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java @@ -2,7 +2,6 @@ package com.cool.store.controller; import com.cool.store.exception.ApiException; import com.cool.store.request.CreateQualifyVerifyReq; -import com.cool.store.request.FinishInterviewReq; import com.cool.store.request.QualificationCallbackReq; import com.cool.store.response.ResponseResult; import com.cool.store.service.FlowService; @@ -26,7 +25,6 @@ public class FlowController { @Autowired private FlowService flowService; - @PostMapping("/qualifyVerify/create") @ApiOperation("发起加盟商资质审核") public ResponseResult createQualifyVerify(@RequestBody CreateQualifyVerifyReq request) throws ApiException, IOException { From ea1e246b2390b0fe73d431fb6a30e288d33b823e Mon Sep 17 00:00:00 2001 From: "xiaodong.hu" <1075471126@qq.com> Date: Tue, 19 Dec 2023 13:11:39 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 4 ++-- .../java/com/cool/store/service/impl/EcSyncServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 80cb1a7ad..48386b34d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -520,7 +520,7 @@ #{userId} - order by a.create_time desc + order by a.create_time,a.id desc @@ -948,7 +948,7 @@ - order by hpli.update_time + order by hpli.update_time,hpli.id desc diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java index a0611a24a..87fe55fa1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java @@ -435,7 +435,7 @@ public class EcSyncServiceImpl implements EcSyncService { if (enterpriseUserDO==null) { // 给飞书群发送消息 跟进人找不到 sendFeiShuRobotMessage("推送：飞书架构中找不到该用户：【" + followUserName + "】，该用户电话号码为：" + followUserMobile, "27243d49-97ca-4981-8aec-7c3bf84eb660"); - throw new ApiException("飞书架构中找不到该用户：【" + followUserName + "】，该用户电话号码为：" + followUserMobile); + return ""; } return enterpriseUserDO.getUserId(); } From 61538825c5b8c69ad9daeb1170dd5d7c14d8bd63 Mon Sep 17 00:00:00 2001 From: "xiaodong.hu" <1075471126@qq.com> Date: Tue, 19 Dec 2023 14:02:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8E=92=E5=BA=8F2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 48386b34d..80cb1a7ad 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -520,7 +520,7 @@ #{userId} - order by a.create_time,a.id desc + order by a.create_time desc @@ -948,7 +948,7 @@ - order by hpli.update_time,hpli.id + order by hpli.update_time desc From 2c97710eaa1938233f662ad4daefa78eaa0d835e Mon Sep 17 00:00:00 2001 From: "xiaodong.hu" <1075471126@qq.com> Date: Tue, 19 Dec 2023 14:37:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8E=92=E5=BA=8F3?= 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 80cb1a7ad..3542284fd 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -832,7 +832,7 @@