From 7e45d2b9104b87a7a94d3635a0246f93a30224ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 21 Jun 2023 16:15:45 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E6=84=8F=E5=90=91=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java | 2 +- .../src/main/java/com/cool/store/vo/PublicSeaLineListVo.java | 4 ++++ .../cool/store/service/impl/HyPartnerLineInfoServiceImpl.java | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java index da0cbf0c2..0d6c6b500 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java @@ -94,7 +94,7 @@ public class HyOpenAreaInfoDAO { return Maps.newHashMap(); } List hyOpenAreaInfoDOS = hyOpenAreaInfoMapper.selectByIds(ids); - return ListUtils.emptyIfNull(hyOpenAreaInfoDOS).stream().collect(Collectors.toMap(k->String.valueOf(k.getId()), v->v.getAreaName())); + return ListUtils.emptyIfNull(hyOpenAreaInfoDOS).stream().collect(Collectors.toMap(k->String.valueOf(k.getId()), v->v.getAreaPath().replace("/"," "))); } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java index 54401ccc6..6d3b9ff44 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java @@ -60,9 +60,13 @@ public class PublicSeaLineListVo { @ApiModelProperty("跟进次数") private Integer followCount; + @ApiModelProperty("意向开店区域ID") private String wantShopArea; + @ApiModelProperty("意向开店区域ID") + private String wantShopAreaName; + private String acceptAdjustType; } 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 1f29681c6..8833d1337 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 @@ -299,6 +299,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { List followCountList = hyPartnerLineInfoDAO.getFollowCountList(partnerIdList); Map countMap = followCountList.stream().collect(Collectors.toMap(LineCountDTO::getPartnerId, LineCountDTO::getFollowCount)); + List wantShopAreaList = list.stream().map(PublicSeaLineDTO::getWantShopArea).map(Long::parseLong).distinct().collect(Collectors.toList()); + Map wantShopAreaNameMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaList); List result = new ArrayList<>(); list.forEach(x->{ PublicSeaLineListVo publicSeaLineListVo = new PublicSeaLineListVo(); @@ -315,6 +317,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { HyPartnerLineInfoDO hy = hyPartnerLineInfoDOMap.getOrDefault(x.getPartnerId(), new HyPartnerLineInfoDO()); publicSeaLineListVo.setRejectPublicReason(hy.getRejectPublicReason()); publicSeaLineListVo.setRejectRealReason(hy.getRejectRealReason()); + publicSeaLineListVo.setWantShopAreaName(wantShopAreaNameMap.get(x.getWantShopArea())); String closeTime = DateUtil.format(hy.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC); publicSeaLineListVo.setLastCloseDate(closeTime); publicSeaLineListVo.setLastInvestmentManager(nameMobileMap.get(hy.getInvestmentManager())); From eff7dce872613beccb37c19493ed6351b7379d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 21 Jun 2023 16:23:56 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E6=84=8F=E5=90=91=E5=8C=BA=E5=9F=9F?= 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 15d775378..30e4fb80e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -36,7 +36,7 @@ - + insert into hy_partner_line_info ( From 3fd490f143867d3075344019abcd577b154fd8a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 21 Jun 2023 16:28:06 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E6=84=8F=E5=90=91=E5=8C=BA=E5=9F=9F112?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/HyPartnerLineInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 8833d1337..3227df5b7 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 @@ -175,6 +175,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { list.stream().forEach(x->{ BlackListVO blackListVO = convertPartnerBlackListDTOToVo(x); blackListVO.setCloseUserPhone(userPhoneMap.get(x.getCloseUserId())); + blackListVO.setCloseUserName(userPhoneMap.get(x.getCloseUserId())); if (StringUtils.isNotEmpty(x.getMobile())){ blackListVO.setPhoneAddress(aliyunService.getPhoneNumberAttribute(x.getMobile()).getCity()); } From 3dea9b51e69d3042d3d3a170110e33e4d28ba236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 21 Jun 2023 16:38:02 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/HyPartnerLineInfoService.java | 2 +- .../cool/store/service/impl/HyPartnerLineInfoServiceImpl.java | 4 +++- .../main/java/com/cool/store/controller/DeskController.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java index 9e4e143b2..0642b1f24 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java @@ -78,7 +78,7 @@ public interface HyPartnerLineInfoService { * @param joinReason * @return */ - Boolean joinBlackList( Long lineId, Integer status, String joinReason); + Boolean joinBlackList(String userId, Long lineId, Integer status, String joinReason); /** * 移除黑名单 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 3227df5b7..d95879009 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 @@ -186,7 +186,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { } @Override - public Boolean joinBlackList(Long lineId, Integer status, String joinReason) { + public Boolean joinBlackList(String userId,Long lineId, Integer status, String joinReason) { if (lineId==null){ throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } @@ -195,6 +195,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { hyPartnerLineInfoDO.setId(lineId); hyPartnerLineInfoDO.setLineStatus(status); hyPartnerLineInfoDO.setJoinBlackReason(joinReason); + hyPartnerLineInfoDO.setCloseTime(new Date()); + hyPartnerLineInfoDO.setCloseUserId(userId); hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index 959f9309c..e06d44fc7 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -15,6 +15,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.propertyeditors.CurrencyEditor; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -234,7 +235,7 @@ public class DeskController { @ApiOperation("加入黑名单") public ResponseResult joinBlackList(@RequestBody LineBlackListRequest lineBlackListRequest){ - return ResponseResult.success(hyPartnerLineInfoService.joinBlackList(lineBlackListRequest.getLineId(),LineStatusEnum.BLACKLIST.getCode(),lineBlackListRequest.getCause())); + return ResponseResult.success(hyPartnerLineInfoService.joinBlackList(CurrentUserHolder.getUserId(),lineBlackListRequest.getLineId(),LineStatusEnum.BLACKLIST.getCode(),lineBlackListRequest.getCause())); } From a3893c4cd376a211ddba1257c5168fbe62a563a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 21 Jun 2023 16:39:31 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/GaoDeService.java | 17 ---------- .../store/service/impl/GaoDeServiceImpl.java | 31 ------------------- .../cool/store/controller/TestController.java | 9 ------ 3 files changed, 57 deletions(-) delete mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/GaoDeService.java delete mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/GaoDeServiceImpl.java diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/GaoDeService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/GaoDeService.java deleted file mode 100644 index 0bf437cdc..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/GaoDeService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cool.store.service; - -/** - * @Author suzhuhong - * @Date 2023/6/21 15:01 - * @Version 1.0 - */ -public interface GaoDeService { - - /** - * 根据经纬度生成图片 - * @param latitudeLongitude - * @return - */ - String getGaoDePicture(String latitudeLongitude); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/GaoDeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/GaoDeServiceImpl.java deleted file mode 100644 index e7704edf3..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/GaoDeServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.service.GaoDeService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import org.springframework.web.client.RestTemplate; - -import javax.annotation.Resource; - -/** - * @Author suzhuhong - * @Date 2023/6/21 15:04 - * @Version 1.0 - */ -@Service -@Slf4j -public class GaoDeServiceImpl implements GaoDeService { - - @Resource - RestTemplate restTemplate; - @Override - public String getGaoDePicture(String latitudeLongitude) { - String url = "https://restapi.amap.com/v3/staticmap?location=120.21201,30.2084&zoom=10&size=750*300&markers=mid,,A:116.481485,39.990464&key=fb6332444cab4eba54655571dfc68f5b&markersStyle=-1"; - ResponseEntity forEntity = restTemplate.getForEntity(url, String.class); - String body = forEntity.getBody(); - log.info("--------------{}", JSONObject.toJSON(body)); - return body; - } -} 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 d2dd62549..6a7b4dd45 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 @@ -2,13 +2,11 @@ package com.cool.store.controller; import com.alibaba.fastjson.JSONObject; import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dto.buser.UserPositionAndUserScopeDTO; import com.cool.store.dto.calendar.CreateCalendarEventDTO; import com.cool.store.dto.calendar.DeleteCalendarEventDTO; import com.cool.store.dto.calendar.UpdateCalendarEventDTO; import com.cool.store.dto.calendar.UserCalendarsEventDTO; import com.cool.store.dto.message.SendCardMessageDTO; -import com.cool.store.dto.partner.DescribePhoneNumberDTO; import com.cool.store.dto.response.ResultDTO; import com.cool.store.entity.HyOpenAreaInfoDO; @@ -25,7 +23,6 @@ import com.cool.store.response.ResponseResult; import com.cool.store.service.AliyunService; import com.cool.store.service.EnterpriseSyncService; import com.cool.store.service.EnterpriseUserService; -import com.cool.store.service.GaoDeService; import com.cool.store.vo.cuser.IdentityCardInfoVO; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -48,8 +45,6 @@ public class TestController { @Resource private EnterpriseUserService enterpriseUserService; @Resource - GaoDeService gaoDeService; - @Resource private ISVHttpRequest isvHttpRequest; @Resource private HyOpenAreaInfoMapper hyOpenAreaInfoMapper; @@ -242,8 +237,4 @@ public class TestController { return ResponseResult.success(enterpriseUserService.getDevelopmentByZoneId(zoneId)); } - @GetMapping("getGaoDePicture") - public ResponseResult getDevelopmentByZoneId(){ - return ResponseResult.success(gaoDeService.getGaoDePicture("")); - } } From 3eafa757c5a6f17d0cf5f2a59d9ca028fba33cae Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Wed, 21 Jun 2023 16:44:42 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E6=8D=A2=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/HyPartnerBaseInfoMapper.xml | 3 ++- .../CoolDownFirstLoginFlagDelRequest.java | 22 +++++++++++++++++++ .../cool/store/vo/PartnerLineBaseInfoVO.java | 7 ++++-- .../store/controller/PartnerController.java | 4 ++-- 4 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/CoolDownFirstLoginFlagDelRequest.java diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml index 608d5bf05..085ebe17a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml @@ -229,7 +229,8 @@ id_card = #{record.idCard}, id_card_photo_front = #{record.idCardPhotoFront}, id_card_photo_black = #{record.idCardPhotoBlack}, - live_address = #{record.liveAddress} + live_address = #{record.liveAddress}, + status = #{record.status} where id = #{record.id} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CoolDownFirstLoginFlagDelRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CoolDownFirstLoginFlagDelRequest.java new file mode 100644 index 000000000..a9c4b0057 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/CoolDownFirstLoginFlagDelRequest.java @@ -0,0 +1,22 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author wxp + * @Date 2023/6/21 14:27 + * @Version 1.0 + */ +@Data +@ApiModel +public class CoolDownFirstLoginFlagDelRequest { + + @NotBlank(message = "线索id不能为空") + @ApiModelProperty("线索id") + private Long lineId; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java index e4b581e4b..f4f0f6815 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java @@ -34,11 +34,11 @@ public class PartnerLineBaseInfoVO { private String workflowStatus; @ApiModelProperty("当前阶段截止时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy.MM.dd HH:mm", timezone = "GMT+8") private Date deadline; @ApiModelProperty("结束跟进时间 冷静期使用 计算15天还剩多少天") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy.MM.dd HH:mm", timezone = "GMT+8") private Date closeTime; @ApiModelProperty("冷静期首次登录标识 true-是首次") @@ -47,5 +47,8 @@ public class PartnerLineBaseInfoVO { @ApiModelProperty("拒绝原因 冷静期提示文案中用到 全部流程中用到(拒绝的时候暂时拒绝原因)") private String cause; + @ApiModelProperty("线索状态:0公海线索;1跟进中;2合作中;3黑名单") + private Integer lineStatus; + } diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java index f87d9fbec..5a99290b7 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java @@ -137,8 +137,8 @@ public class PartnerController { @PostMapping(path = "/delCoolDownFirstLoginFlag") @ApiOperation("删除冷静期是否首次登录缓存") - public ResponseResult delCoolDownFirstLoginFlag(@RequestParam(value = "lineId",required = true)Long lineId){ - String coolingPeriodFirstLoginCacheKey = MessageFormat.format(RedisConstant.COOLINGPERIOD_FIRSTLOGIN_KEY, lineId); + public ResponseResult delCoolDownFirstLoginFlag(@RequestBody CoolDownFirstLoginFlagDelRequest coolDownFirstLoginFlagDelRequest){ + String coolingPeriodFirstLoginCacheKey = MessageFormat.format(RedisConstant.COOLINGPERIOD_FIRSTLOGIN_KEY, coolDownFirstLoginFlagDelRequest.getLineId()); redisUtilPool.delKey(coolingPeriodFirstLoginCacheKey); return ResponseResult.success(true); } From 9d4db0e4d8c372c2cd7b6b176a5de4411ba1d7e1 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 21 Jun 2023 17:04:26 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E9=9A=8F?= =?UTF-8?q?=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/AliyunServiceImpl.java | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java index 8642182a9..87afd01f3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java @@ -15,6 +15,7 @@ import com.cool.store.exception.ServiceException; import com.cool.store.service.AliyunService; import com.cool.store.utils.RedisConstantUtil; import com.cool.store.utils.RedisUtilPool; +import com.cool.store.utils.UUIDUtils; import com.cool.store.vo.cuser.IdentityCardInfoVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -29,6 +30,7 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.Objects; import java.util.Optional; +import java.util.Random; /** * @author zhangchenbiao @@ -85,6 +87,10 @@ public class AliyunServiceImpl implements AliyunService { // 访问的域名 config.endpoint = "ocr.cn-shanghai.aliyuncs.com"; try { + if(StringUtils.isNotBlank(faceImageUrl)){ + String idCard = generateIdCard(); + return new IdentityCardInfoVO(getRandomName(), generateAddress(), convertDate(idCard.substring(6, 14), "yyyyMMdd"), UUIDUtils.get8UUID().hashCode() % 2 == 0 ? "男":"女", idCard, "汉"); + } com.aliyun.ocr20191230.Client client = new com.aliyun.ocr20191230.Client(config); URL url = new URL(faceImageUrl); InputStream inputStream = url.openConnection().getInputStream(); @@ -134,4 +140,85 @@ public class AliyunServiceImpl implements AliyunService { throw new ServiceException(ErrorCodeEnum.DATA_CONVERT_ERROR); } } + public static String generateAddress() { + String address = ""; + String[] provinceList = {"北京市", "上海市", "广东省", "江苏省", "浙江省", "四川省", "湖南省", "河北省", "山东省", "陕西省"}; + String[] cityList = {"北京市", "上海市", "广州市", "南京市", "杭州市", "成都市", "长沙市", "石家庄市", "济南市", "西安市"}; + String[] regionList = {"朝阳区", "浦东新区", "天河区", "玄武区", "拱墅区", "锦江区", "芙蓉区", "桥西区", "历下区", "雁塔区"}; + String[] streetList = {"中山北路", "人民路", "长安街", "南京西路", "华山路", "锦江大道", "芙蓉中路", "胜利大街", "经十路", "雁塔路"}; + String[] numberList = {"1号", "2号", "3号", "4号", "5号", "6号", "7号", "8号", "9号", "10号"}; + String province = provinceList[new Random().nextInt(provinceList.length)]; + String city = cityList[new Random().nextInt(cityList.length)]; + String region = regionList[new Random().nextInt(regionList.length)]; + String street = streetList[new Random().nextInt(streetList.length)]; + String number = numberList[new Random().nextInt(numberList.length)]; + address = province + city + region + street + number; + return address; + } + + + + public static String generateIdCard() { + String [] CITY_CODES = new String[] { + "110000", "120000", "130000", "140000", "150000", "210000", "220000", "230000", "310000", "320000", + "330000", "340000", "350000", "360000", "370000", "410000", "420000", "430000", "440000", "450000", + "460000", "500000", "510000", "520000", "530000", "540000", "610000", "620000", "630000", "640000", + "650000" + }; + String BIRTHDAY_START = "19800101"; + String BIRTHDAY_END = "20000101"; + Random random = new Random(); + // 地址码：前6位数字，表示户籍所在地行政区划代码 + String addressCode = CITY_CODES[random.nextInt(CITY_CODES.length)]; + // 出生日期码：7到14位数字，表示出生年月日 + LocalDate birthday = LocalDate.ofEpochDay(random.nextInt( + (int)(LocalDate.parse(BIRTHDAY_END, DateTimeFormatter.BASIC_ISO_DATE).toEpochDay() - LocalDate.parse(BIRTHDAY_START, DateTimeFormatter.BASIC_ISO_DATE).toEpochDay()) + ) + LocalDate.parse(BIRTHDAY_START, DateTimeFormatter.BASIC_ISO_DATE).toEpochDay()); + String birthdayCode = birthday.format(DateTimeFormatter.ofPattern("yyyyMMdd")); + // 顺序码：15到17位数字，表示在同一地址码所在区域范围内，对同年同月同日出生的人的顺序编号 + String sequenceCode = String.format("%03d", random.nextInt(1000)); + // 计算校验码 + String body = addressCode + birthdayCode + sequenceCode; + int[] weight = {7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2}; + String[] checkCode = {"1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"}; + int sum = 0; + for (int i = 0; i < body.length(); i++) { + sum += (body.charAt(i) - '0') * weight[i]; + } + int remainder = sum % 11; + String checkCodeStr = checkCode[remainder]; + + // 构造身份证号码 + return body + checkCodeStr; + } + + private static char[] lastNames = { '赵', '钱', '孙', '李', '周', '吴', '郑', '王', '冯', '陈', '褚', '卫', '蒋', '沈', '韩', '杨', '朱', '秦', '尤', '许', '何', '吕', '施', '张', '孔', '曹', '严', '华', '金', '魏', '陶', '姜', '戚', '谢', '邹', '喻', '柏', '水', '窦', '章', '云', '苏', '潘', '葛', '奚', '范', '彭', '郎', '鲁', '韦', '昌', '马', '苗', '凤', '花', '方', '俞', '任', '袁', '柳', '酆', '鲍', '史', '唐', '费', '廉', '岑', '薛', '雷', '贺', '倪', '汤', '滕', '殷', '罗', '毕', '郝', '邬', '安', '常', '乐', '于', '时', '傅', '皮', '卞', '齐', '康', '伍', '余', '元', '卜', '顾', '孟', '平', '黄', '和', '穆', '肖', '尹', '营', '姚', '邵', '湛', '汪', '祁', '毛', '禹', '狄', '米', '贝', '明', '臧', '计', '伏', '成', '戴', '谈', '宋', '茅', '庞', '熊', '纪', '舒', '屈', '项', '祝', '董', '粱', '杜', '阮', '蓝', '闵', '席', '季', '麻', '强', '贾', '路', '娄', '危', '江', '童', '颜', '郭', '梅', '盛', '林', '刁', '钟', '徐', '邱', '骆', '高', '夏', '蔡', '田', '樊', '胡', '凌', '霍', '虞', '万', '支', '柯', '昝', '管', '卢', '莫', '经', '房', '裘', '缪', '干', '解', '应', '宗', '丁', '宣', '贲', '郁', '单', '杭', '洪', '包', '诸', '左', '石', '崔', '吉', '钮', '龚', '程', '嵇', '邢', '滑', '裴', '陆', '荣', '翁', '荀', '羊', '於', '惠', '甄', '加', '封', '芮', '麴', '井', '牟', '乘', '裘', '栾', '于', '冷', '甘', '归', '海', '嵩', '福', '景', '祖', '武', '符', '文', '御', '卫', '安', '柴', '颛', '段', '侯', '叶', '孟', '平', '呼', '南', '仇', '胥', '戊', '缑', '雍', '却', '璩', '桑', '桂', '濮', '閻', '充', '慕', '连', '茹', '习', '宦', '艾', '鱼', '容', '向', '古', '易', '慎', '戈', '廖', '庾', '终', '暨', '居', '衡', '步', '都', '耿', '满', '弘', '匡', '国', '文', '寇', '广', '禄', '阙', '东', '欧', '殳', '沃', '利', '蔚', '越', '夔', '隆', '师', '巩', '厍', '聂', '晁', '勾', '敖', '融', '冷', '訾', '辛', '阚', '那', '简', '饶', '空', '曾', '毋', '沙', '乜', '养', '鞠', '须', '丰', '巢', '关', '蒯', '相', '查', '后', '荆', '红', '游', '竺', '权', '逯', '盖', '益', '桓', '公', '牛', '应', '冉', '司', '马'}; + + private static char getRandomChar() { + Random rand = new Random(); + return (char) (0x4e00 + rand.nextInt(0x9fa5 - 0x4e00 + 1)); + } + + public static String getRandomName() { + Random rand = new Random(); + String name = ""; + // 先随机选择一个姓氏 + char lastName = lastNames[rand.nextInt(lastNames.length)]; + name += lastName; + + // 再随机生成1-2个名字 + int nameLen = rand.nextInt(2) + 1; + for (int i = 0; i < nameLen; i++) { + name += getRandomChar(); + } + + return name; + } + + public static void main(String[] args) { + System.out.println(generateIdCard().substring(6, 14)); + System.out.println(getRandomName()); + System.out.println(generateAddress()); + } + } From 2bf264a535d3dc77d73f08cc3fef34dc4fa12db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 21 Jun 2023 17:19:42 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E7=A7=81=E6=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/HyPartnerLineInfoMapper.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 30e4fb80e..13091ea9a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -464,10 +464,10 @@ LEFT JOIN hy_partner_user_info hpuinfo ON hpli.partner_id = hpuinfo.partner_id LEFT JOIN enterprise_user eu ON hpli.investment_manager = eu.user_id WHERE line_status in (1,2) - + AND (eu.name like concat('%',#{keyword},'%') or hpuinfo.username like concat('%',#{keyword},'%')) - + AND ( eu.mobile like concat('%',#{keyword},'%') or hpuinfo.mobile like concat('%',#{keyword},'%')') @@ -485,16 +485,16 @@ AND hpuinfo.accept_adjust_type = #{acceptAdjustType} - + AND hpuinfo.shop_code like concat('%',#{storeKeyword},'%') - + AND hpuinfo.shop_name like concat('%',#{storeKeyword},'%') - + AND hpuinfo.recommend_partner_name like concat('%',#{storeKeyword},'%') - + AND hpuinfo.recommend_partner_mobile like concat('%',#{storeKeyword},'%') From 81cefc286238d1eed32c9a6c912d12a2103d2f87 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 21 Jun 2023 17:19:50 +0800 Subject: [PATCH 09/22] sql update --- .../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 30e4fb80e..8c348e1aa 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -474,7 +474,7 @@ AND hpli.workflow_stage = #{workflowStage} - AND hpli.workflow_status = #workflowStatus} + AND hpli.workflow_status = #{workflowStatus} AND hpli.deadline BETWEEN #{deadlineStart} and #{deadlineStart} From 126cb29f189d87df185b37bd48b71917e7a758b8 Mon Sep 17 00:00:00 2001 From: pserimal Date: Wed, 21 Jun 2023 17:20:19 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?= =?UTF-8?q?=E9=AA=8C=E7=AD=BEresponse=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/config/SignValidateFilter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java index 9d554b0a3..1c3a6050b 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -112,6 +112,7 @@ public class SignValidateFilter implements Filter { // 前后端验签不等 if (!newSign.equals(sign)) { response.setStatus(HttpStatus.OK.value()); + response.setContentType("application/json;charset=UTF-8"); response.getWriter().write(JSON.toJSONString(ResponseResult.fail(ErrorCodeEnum.SIGN_FAIL))); return; } From 4a3f49d1fca6f88b50b3d5d87ac5dda52c67ab9f Mon Sep 17 00:00:00 2001 From: pserimal Date: Wed, 21 Jun 2023 17:20:45 +0800 Subject: [PATCH 11/22] =?UTF-8?q?PDF=E8=BD=AC=E5=9B=BE=E7=89=87=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/utils/PDFUtils.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 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 e2f9eb1e6..f7ee13f9d 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 @@ -5,6 +5,7 @@ import com.lowagie.text.Font; import com.lowagie.text.Image; import com.lowagie.text.Paragraph; import com.lowagie.text.pdf.*; +import lombok.extern.slf4j.Slf4j; import org.icepdf.core.exceptions.PDFException; import org.icepdf.core.exceptions.PDFSecurityException; import org.icepdf.core.pobjects.Page; @@ -19,6 +20,7 @@ import java.io.*; /** * 使用 OpenPDF 封装的 pdf 工具类 */ +@Slf4j public class PDFUtils { private static final int[] A4Size = {595, 842}; @@ -145,20 +147,16 @@ public class PDFUtils { GraphicsRenderingHints.SCREEN, Page.BOUNDARY_CROPBOX, rotation, scale); RenderedImage rendImage = image; - try { - ImageIO.write(rendImage, "png", outputStream); - //例子中是pdf转png格式的，也可以将上面两行改成jpg，转出jpg格式的， - //但是从转换效果来看png的清晰度会相对较高。有个小技巧是第一行行改成jpg， - //但第二行使用png，也就是转换成jpg格式但有png清晰度的图片。 - } catch (IOException e) { - e.printStackTrace(); - } + ImageIO.write(rendImage, "png", outputStream); + //例子中是pdf转png格式的，也可以将上面两行改成jpg，转出jpg格式的， + //但是从转换效果来看png的清晰度会相对较高。有个小技巧是第一行行改成jpg， + //但第二行使用png，也就是转换成jpg格式但有png清晰度的图片。 image.flush(); document.dispose(); return outputStream; } - } catch (PDFException | PDFSecurityException | IOException e1) { - e1.printStackTrace(); + } catch (PDFException | IOException | PDFSecurityException e) { + log.error("PDF转图片异常, e{}", e.getMessage()); } finally { try { outputStream.close(); From afbca96734f53a0b85d0133068517c443b22b330 Mon Sep 17 00:00:00 2001 From: pserimal Date: Wed, 21 Jun 2023 17:22:06 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BD=BF=E7=94=A8POST=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=8A=A0=E8=AF=B7=E6=B1=82=E4=BD=93=E7=9A=84=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dto/content/ContentDelDto.java | 12 ++++++++++++ .../store/dto/content/ContentQueryDetailDto.java | 12 ++++++++++++ .../dto/partner/PartnerGetPassLetterDetailDto.java | 12 ++++++++++++ .../store/dto/partner/PartnerQueryInterviewDto.java | 12 ++++++++++++ .../com/cool/store/controller/ContentController.java | 12 +++++------- .../com/cool/store/controller/ContentController.java | 5 +++-- .../cool/store/controller/InterviewController.java | 10 ++++++---- 7 files changed, 62 insertions(+), 13 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentDelDto.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryDetailDto.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerGetPassLetterDetailDto.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerQueryInterviewDto.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentDelDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentDelDto.java new file mode 100644 index 000000000..8458c06ca --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentDelDto.java @@ -0,0 +1,12 @@ +package com.cool.store.dto.content; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ContentDelDto { + + @ApiModelProperty("动态id") + private String contentId; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryDetailDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryDetailDto.java new file mode 100644 index 000000000..b3cff95bd --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryDetailDto.java @@ -0,0 +1,12 @@ +package com.cool.store.dto.content; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ContentQueryDetailDto { + + @ApiModelProperty("动态id") + private String contentId; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerGetPassLetterDetailDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerGetPassLetterDetailDto.java new file mode 100644 index 000000000..160f9e4b4 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerGetPassLetterDetailDto.java @@ -0,0 +1,12 @@ +package com.cool.store.dto.partner; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PartnerGetPassLetterDetailDto { + + @ApiModelProperty("面试计划id") + private String interviewPlanId; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerQueryInterviewDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerQueryInterviewDto.java new file mode 100644 index 000000000..1d0e07cef --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerQueryInterviewDto.java @@ -0,0 +1,12 @@ +package com.cool.store.dto.partner; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PartnerQueryInterviewDto { + + @ApiModelProperty("加盟商用户id") + private String partnerId; + +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java index 4885b048f..5f77e5aa1 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java @@ -1,8 +1,6 @@ package com.cool.store.controller; -import com.cool.store.dto.content.ContentAddDto; -import com.cool.store.dto.content.ContentQueryListDto; -import com.cool.store.dto.content.ContentUpdateDto; +import com.cool.store.dto.content.*; import com.cool.store.entity.HyContentInfoDO; import com.cool.store.response.ResponseResult; import com.cool.store.service.ContentService; @@ -34,8 +32,8 @@ public class ContentController { @PostMapping("/delete") @ApiOperation("删除动态") - public ResponseResult deleteContent(@RequestParam(value = "contentId") String contentId) { - contentService.deleteContent(contentId); + public ResponseResult deleteContent(@RequestBody ContentDelDto dto) { + contentService.deleteContent(dto.getContentId()); return ResponseResult.success(); } @@ -57,8 +55,8 @@ public class ContentController { @PostMapping("/detail") @ApiOperation("动态详情") - public ResponseResult queryContentInfo(@RequestBody String contentId) { - return ResponseResult.success(contentService.queryContentInfo(contentId)); + public ResponseResult queryContentInfo(@RequestBody ContentQueryDetailDto dto) { + return ResponseResult.success(contentService.queryContentInfo(dto.getContentId())); } } diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java index dc5e0823e..8f4f03976 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java @@ -1,5 +1,6 @@ package com.cool.store.controller; +import com.cool.store.dto.content.ContentQueryDetailDto; import com.cool.store.dto.content.ContentQueryListDto; import com.cool.store.entity.HyContentInfoDO; import com.cool.store.response.ResponseResult; @@ -35,8 +36,8 @@ public class ContentController { @PostMapping("/detail") @ApiOperation("动态详情") - public ResponseResult queryContentInfo(@RequestBody String contentId) { - return ResponseResult.success(contentService.queryContentInfo(contentId)); + public ResponseResult queryContentInfo(@RequestBody ContentQueryDetailDto dto) { + return ResponseResult.success(contentService.queryContentInfo(dto.getContentId())); } } diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java index 34a13860d..f6bfcec47 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java @@ -1,6 +1,8 @@ package com.cool.store.controller; import com.cool.store.dto.partner.EnterInterviewDto; +import com.cool.store.dto.partner.PartnerGetPassLetterDetailDto; +import com.cool.store.dto.partner.PartnerQueryInterviewDto; import com.cool.store.exception.ApiException; import com.cool.store.request.CreateAppointmentReq; import com.cool.store.request.ModifyInterviewTimeReq; @@ -30,8 +32,8 @@ public class InterviewController { @PostMapping("/queryByPartnerId") @ApiOperation("根据用户id查询面试信息") - public ResponseResult queryByPartnerId(@RequestBody String partnerId) { - return ResponseResult.success(interviewService.queryByPartnerId(partnerId)); + public ResponseResult queryByPartnerId(@RequestBody PartnerQueryInterviewDto dto) { + return ResponseResult.success(interviewService.queryByPartnerId(dto.getPartnerId())); } @PostMapping("/enter") @@ -42,8 +44,8 @@ public class InterviewController { @PostMapping("/passLetter/detail") @ApiOperation("通过函详情") - public ResponseResult passLetterDetail(@RequestParam String interviewPlanId) { - return ResponseResult.success(interviewService.passLetterDetail(interviewPlanId)); + public ResponseResult passLetterDetail(@RequestBody PartnerGetPassLetterDetailDto dto) { + return ResponseResult.success(interviewService.passLetterDetail(dto.getInterviewPlanId())); } @PostMapping("/appointment/submit") From 89c4546e9faf4479faeb9cebad8e446de05c6c03 Mon Sep 17 00:00:00 2001 From: pserimal Date: Wed, 21 Jun 2023 17:22:49 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0=E5=BC=80=E5=8F=91=E4=B8=BB?= =?UTF-8?q?=E7=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/FlowServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 d16926799..9a5c9c028 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 @@ -92,7 +92,7 @@ public class FlowServiceImpl implements FlowService { fraSourceDO.setKey("HSAYPartner"); fraSourceDO.setText("沪上阿姨合伙人"); data.setFraSource(fraSourceDO); - data.setAmtDeposit(Integer.valueOf(request.getSecurityFund())); + data.setAmtDeposit(Integer.parseInt(request.getSecurityFund())); //获取授权码 String authCode = null; @@ -118,9 +118,9 @@ public class FlowServiceImpl implements FlowService { } data.setIntendedSigner(request.getIntentionSignerUsername()); data.setIntendedSignerTel(request.getIntentionSignerMobile()); - //通过 rpc 请求审核系统获取返回数据 Map qualifyVerifyRespData = JSON.parseObject(createQualifyVerify(rpcRequest), new TypeReference>() {}); + //2.更新审核信息 HyPartnerCertificationInfoDO partnerCertificationInfoDO = new HyPartnerCertificationInfoDO(); partnerCertificationInfoDO.setPartnerId(request.getPartnerId()); @@ -147,6 +147,7 @@ public class FlowServiceImpl implements FlowService { //set 意向合同编号 partnerCertificationInfoDO.setIntentionContractNo(qualifyVerifyRespData.get("sequenceNo")); hyPartnerCertificationInfoMapper.updateByPrimaryKeySelective(partnerCertificationInfoDO); + //3.更新面试信息 //根据面试id获取面试信息 HyPartnerInterviewDO hyPartnerInterviewDO = hyPartnerInterviewMapper.selectByPrimaryKeySelective(request.getInterviewId()); @@ -158,6 +159,13 @@ public class FlowServiceImpl implements FlowService { hyPartnerInterviewDO.setStatus(Integer.valueOf(WorkflowStatusEnum.INTERVIEW_4.getCode())); hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); + //4. 更新线索信息（开发主管） + if (!StringUtils.isEmpty(request.getDevtDirectorId())) { + HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); + hyPartnerLineInfoDO.setId(Long.parseLong(request.getLineId())); + hyPartnerLineInfoDO.setDevelopmentDirector(request.getDevtDirectorId()); + hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineInfoDO); + } } @Override From 402d18bf20322572d26f51a5d9efa021544ad2fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 21 Jun 2023 17:23:44 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E7=A7=81=E6=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java | 4 ++++ .../store/service/impl/HyPartnerIntentInfoServiceImpl.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java index fb5766594..b601bbb1d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java @@ -25,6 +25,10 @@ public class PartnerIntentInfoVO { @ApiModelProperty("加盟商姓名") private String partnerUserName; + private String workflowStage; + + private String workflowStauts; + @ApiModelProperty("加盟商手机号") private String partnerUserPhone; 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 b6ab0e87a..56e2d0df2 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 @@ -9,6 +9,7 @@ import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; import com.cool.store.dto.partner.PrivateSeaLineDTO; import com.cool.store.entity.HyOpenAreaInfoDO; import com.cool.store.entity.HyPartnerIntentInfoDO; +import com.cool.store.entity.HyPartnerLineInfoDO; import com.cool.store.entity.HyPartnerUserInfoDO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.WorkflowStageEnum; @@ -110,9 +111,12 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic if(Objects.isNull(hyPartnerIntentInfoDO)){ return null; } + HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId); PartnerIntentInfoVO partnerIntentInfoVO = convertPartnerIntentApplyInfoDOToVO(hyPartnerIntentInfoDO); HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerIntentInfoDO.getPartnerId()); partnerIntentInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername()); + partnerIntentInfoVO.setWorkflowStage(hyPartnerLineInfoDO.getWorkflowStage()); + partnerIntentInfoVO.setWorkflowStauts(hyPartnerLineInfoDO.getWorkflowStatus()); partnerIntentInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile()); HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea())); partnerIntentInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaName()); From 5f0aa220cd8274721acd3a84c1056923e210634e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 21 Jun 2023 17:39:11 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BA=BF=E7=B4=A2?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E9=9D=A2=E8=AF=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/dao/HyPartnerInterviewPlanDAO.java | 7 +++++ .../mapper/HyPartnerInterviewPlanMapper.java | 2 ++ .../mapper/HyPartnerInterviewPlanMapper.xml | 4 +++ .../service/HyPartnerLineInfoService.java | 3 +- .../impl/HyPartnerLineInfoServiceImpl.java | 28 +++++++++++++++---- .../cool/store/controller/DeskController.java | 11 ++++++++ 6 files changed, 48 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java index be2b11221..a5ca2012f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java @@ -82,5 +82,12 @@ public class HyPartnerInterviewPlanDAO { return hyPartnerInterviewPlanMapper.getPartnerInterviewInfoList(userId,workflowStage,workflowStatus); } + public Long selectInterviewIdByLineId(Long lineId){ + if (lineId==null){ + return 0L; + } + return hyPartnerInterviewPlanMapper.selectInterviewIdByLineId(lineId); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java index bb5f45482..6df00463f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java @@ -94,6 +94,8 @@ public interface HyPartnerInterviewPlanMapper { */ EnterpriseUserBaseInfoVO getEnterpriseUserBaseInfo(@Param("userId") String userId); + Long selectInterviewIdByLineId(Long lineId); + /** * 根据条件字段查询面试安排信息 * @param record diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 32c95fdcd..1dd9eaa09 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -374,6 +374,10 @@ + +