From 9e5ad14f30e4b6ec1034129c63f5148dd1018362 Mon Sep 17 00:00:00 2001 From: pserimal Date: Wed, 21 Jun 2023 15:13:50 +0800 Subject: [PATCH 01/10] =?UTF-8?q?POST=E8=AF=B7=E6=B1=82=E4=BD=BF=E7=94=A8B?= =?UTF-8?q?ody=E5=8F=91=E9=80=81=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/controller/ContentController.java | 2 +- .../main/java/com/cool/store/controller/ContentController.java | 2 +- .../java/com/cool/store/controller/InterviewController.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) 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 3e82c2e05..4885b048f 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 @@ -57,7 +57,7 @@ public class ContentController { @PostMapping("/detail") @ApiOperation("动态详情") - public ResponseResult queryContentInfo(@RequestParam String contentId) { + public ResponseResult queryContentInfo(@RequestBody String contentId) { return ResponseResult.success(contentService.queryContentInfo(contentId)); } 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 05c4c42ef..dc5e0823e 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 @@ -35,7 +35,7 @@ public class ContentController { @PostMapping("/detail") @ApiOperation("动态详情") - public ResponseResult queryContentInfo(@RequestParam String contentId) { + public ResponseResult queryContentInfo(@RequestBody String contentId) { return ResponseResult.success(contentService.queryContentInfo(contentId)); } 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 546837d9e..34a13860d 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 @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "加盟商资格面试") @RestController @RequestMapping("/interview") +@CrossOrigin public class InterviewController { @Autowired @@ -29,7 +30,7 @@ public class InterviewController { @PostMapping("/queryByPartnerId") @ApiOperation("根据用户id查询面试信息") - public ResponseResult queryByPartnerId(@RequestParam String partnerId) { + public ResponseResult queryByPartnerId(@RequestBody String partnerId) { return ResponseResult.success(interviewService.queryByPartnerId(partnerId)); } From fa410088f7c151e2b3411dbe21ca76c3532fe91d Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Wed, 21 Jun 2023 15:27:34 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dao/HyPartnerBaseInfoDAO.java | 9 ++++-- .../store/mapper/HyPartnerBaseInfoMapper.java | 5 ++- .../mapper/HyPartnerBaseInfoMapper.xml | 16 ++++++++-- .../service/HyPartnerBaseInfoService.java | 3 +- .../service/HyPartnerLineInfoService.java | 2 +- .../impl/HyPartnerBaseInfoServiceImpl.java | 32 ++++++++++++++++--- .../impl/HyPartnerIntentInfoServiceImpl.java | 2 +- .../impl/HyPartnerLineInfoServiceImpl.java | 6 +++- .../impl/PartnerUserInfoServiceImpl.java | 2 +- .../store/controller/PartnerController.java | 9 +++--- 10 files changed, 67 insertions(+), 19 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java index 59c49028e..4ec536f9c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java @@ -34,6 +34,11 @@ public class HyPartnerBaseInfoDAO { return hyPartnerBaseInfoMapper.updateByPrimaryKeySelective(record); } + public int updateByPrimaryKey(HyPartnerBaseInfoDO record){ + return hyPartnerBaseInfoMapper.updateByPrimaryKey(record); + } + + public int updateByPartnerId(String userName,String mobile,String partnerId){ return hyPartnerBaseInfoMapper.updateByPartnerId(userName,mobile,partnerId); } @@ -57,10 +62,10 @@ public class HyPartnerBaseInfoDAO { return hyPartnerBaseInfoMapper.getByPartnerLineId(partnerLineId); } - public Long getLineIdByIdCard(String idCard){ + public HyPartnerBaseInfoDO getByIdCard(String idCard){ if (StringUtils.isEmpty(idCard)){ return null; } - return hyPartnerBaseInfoMapper.getLineIdByIdCard(idCard); + return hyPartnerBaseInfoMapper.getByIdCard(idCard); } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java index 2d47cdf3c..c6a8c64a4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java @@ -23,6 +23,9 @@ public interface HyPartnerBaseInfoMapper { */ int updateByPrimaryKeySelective(@Param("record") HyPartnerBaseInfoDO record); + int updateByPrimaryKey(@Param("record") HyPartnerBaseInfoDO record); + + /** * 根据加盟商ID修改用户名称与手机号 * @param userName @@ -38,7 +41,7 @@ public interface HyPartnerBaseInfoMapper { HyPartnerBaseInfoDO getByPartnerLineId(@Param("partnerLineId") Long partnerLineId); - Long getLineIdByIdCard(@Param("idCard") String idCard); + HyPartnerBaseInfoDO getByIdCard(@Param("idCard") String idCard); int cleanIdCardInfoByPartnerLineId(@Param("idCard") String idCard, @Param("idCardPhotoFront") String idCardPhotoFront, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml index a108097d9..1313e9fc5 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml @@ -203,6 +203,18 @@ where id = #{record.id} + + update hy_partner_base_info + set + nation = #{record.nation}, + birthdate = #{record.birthdate}, + id_card = #{record.idCard}, + id_card_photo_front = #{record.idCardPhotoFront}, + id_card_photo_black = #{record.idCardPhotoBlack}, + live_address = #{record.liveAddress} + where id = #{record.id} + + update hy_partner_base_info @@ -231,9 +243,9 @@ where partner_line_id = #{partnerLineId} - select - partner_line_id + from hy_partner_base_info where id_card = #{idCard} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerBaseInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerBaseInfoService.java index 2c31eedaf..364464005 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerBaseInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerBaseInfoService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.entity.HyPartnerBaseInfoDO; import com.cool.store.request.AddTagsRequest; import com.cool.store.request.PartnerBaseInfoRequest; import com.cool.store.vo.PartnerBaseInfoVO; @@ -26,7 +27,7 @@ public interface HyPartnerBaseInfoService { PartnerBaseInfoVO getByPartnerLineId(Long lineId); - Long getLineIdByIdCard(String idCard); + HyPartnerBaseInfoDO getByIdCard(String idCard); Boolean changeBinding(String idCard, Long lineId, PartnerUserInfoVO currentUser); 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 12f36785c..9e4e143b2 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 @@ -128,7 +128,7 @@ public interface HyPartnerLineInfoService { * @param lineId * @return */ - Boolean assignFollowUser(String partnerId); + Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType); /** * 线索状态 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java index dd5908523..7d79b0ba6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.MessageFormat; +import java.util.Date; /** * @Author suzhuhong @@ -120,15 +121,15 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { } @Override - public Long getLineIdByIdCard(String idCard) { - return hyPartnerBaseInfoDAO.getLineIdByIdCard(idCard); + public HyPartnerBaseInfoDO getByIdCard(String idCard) { + return hyPartnerBaseInfoDAO.getByIdCard(idCard); } @Override public Boolean changeBinding(String idCard, Long lineId, PartnerUserInfoVO currentUser) { // 把旧线索的身份证号置空，状态改为待提交 - Long oldLineId = hyPartnerBaseInfoDAO.getLineIdByIdCard(idCard); - HyPartnerLineInfoDO oldLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(oldLineId); + HyPartnerBaseInfoDO oldBaseInfo = hyPartnerBaseInfoDAO.getByIdCard(idCard); + HyPartnerLineInfoDO oldLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(oldBaseInfo.getPartnerLineId()); // 该身份证当前申请状态同步至该账号下，原账号变为【加盟意向申请 待提交状态】 HyPartnerLineInfoDO newLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId); newLineInfo.setWorkflowStage(oldLineInfo.getWorkflowStage()); @@ -139,11 +140,32 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { oldLineInfo.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); oldLineInfo.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode()); hyPartnerLineInfoDAO.updateByPrimaryKeySelective(oldLineInfo); - hyPartnerBaseInfoDAO.cleanIdCardInfoByPartnerLineId(null, null, null, oldLineId); // 新线索绑定身份证号 + HyPartnerBaseInfoDO newBaseInfo = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(currentUser.getPartnerId(), lineId); + fillBaseInfoIdCard(newBaseInfo, oldBaseInfo.getIdCard(), oldBaseInfo.getIdCardPhotoFront(), oldBaseInfo.getIdCardPhotoBlack(), oldBaseInfo.getUsername(), + oldBaseInfo.getSex(), oldBaseInfo.getBirthdate(), oldBaseInfo.getNation(), oldBaseInfo.getLiveAddress(), oldBaseInfo.getStatus()); + newBaseInfo.setStatus(oldBaseInfo.getStatus()); + hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(newBaseInfo); + // 老的身份证信息置空 + fillBaseInfoIdCard(oldBaseInfo, null, null, null, null, null, null, null, null, null); + oldBaseInfo.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())); + hyPartnerBaseInfoDAO.updateByPrimaryKey(oldBaseInfo); return true; } + private void fillBaseInfoIdCard(HyPartnerBaseInfoDO newBaseInfo, String idCard, String idCardPhotoFront, String idCardPhotoBlack, + String username, Integer sex, Date birthdate, String nation, String liveAddress, Integer status) { + newBaseInfo.setIdCard(idCard); + newBaseInfo.setIdCardPhotoBlack(idCardPhotoFront); + newBaseInfo.setIdCardPhotoFront(idCardPhotoBlack); + newBaseInfo.setUsername(username); + newBaseInfo.setSex(sex); + newBaseInfo.setBirthdate(birthdate); + newBaseInfo.setNation(nation); + newBaseInfo.setLiveAddress(liveAddress); + newBaseInfo.setStatus(status); + } + private void fillBaseInfo(HyPartnerBaseInfoDO baseInfoDO, PartnerBaseInfoRequest request) { baseInfoDO.setPartnerId(request.getPartnerId()); baseInfoDO.setPartnerLineId(request.getPartnerLineId()); 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 73398bedd..b6ab0e87a 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 @@ -173,7 +173,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic intentInfoDO.setMaxBudget(request.getMaxBudget()); intentInfoDO.setMoneySource(request.getMoneySource()); if(CollectionUtils.isNotEmpty(request.getMoneyProve())){ - intentInfoDO.setMoneyProve(String.join(",", request.getMoneyProve())); + intentInfoDO.setMoneyProve(JSONObject.toJSONString(request.getMoneyProve())); } intentInfoDO.setEducation(request.getEducation()); intentInfoDO.setWorkYear(request.getWorkYear()); 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 da9e481a7..c794e1238 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 @@ -372,10 +372,14 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { } @Override - public Boolean assignFollowUser(String partnerId) { + public Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType) { List lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId); //当前加盟商线索 HyPartnerLineInfoDO HyPartnerLineInfo = hyPartnerLineInfoDAO.getByPartnerId(partnerId); + if(HyPartnerLineInfo == null){ + Boolean lineStatus = getLineStatus(Long.valueOf(wantShopArea), acceptAdjustType); + return lineStatus; + } //如果是私海线索 不需要重新分配招商经理 或者跟进次数大于1 if (HyPartnerLineInfo.getLineStatus()==1||CollectionUtils.isEmpty(lineFollowHistoryList)){ return Boolean.FALSE; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java index f9e284b36..df770d4ed 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java @@ -107,7 +107,7 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { hyPartnerLineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); - Boolean flag = hyPartnerLineInfoService.assignFollowUser(hyPartnerLineInfoDO.getPartnerId()); + Boolean flag = hyPartnerLineInfoService.assignFollowUser(hyPartnerLineInfoDO.getPartnerId(), partnerUserInfoRequest.getWantShopArea(), partnerUserInfoRequest.getAcceptAdjustType()); hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); if (flag){ hyPartnerLineInfoDO.setInvestmentManager("ou_7a6a19ae800afde783b0ec2dabaabf95"); 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 e20bfcf2a..f87d9fbec 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 @@ -2,6 +2,7 @@ package com.cool.store.controller; import com.cool.store.constants.RedisConstant; import com.cool.store.context.PartnerUserHolder; +import com.cool.store.entity.HyPartnerBaseInfoDO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.IDCardSideEnum; import com.cool.store.enums.WorkflowStatusEnum; @@ -70,10 +71,10 @@ public class PartnerController { @ApiImplicitParams({ @ApiImplicitParam(name = "idCard", value = "身份证号码", required = false), }) - public ResponseResult getLineByIdCard(@RequestParam(value = "idCard",required = false)String idCard){ + public ResponseResult getByIdCard(@RequestParam(value = "idCard",required = false)String idCard){ - Long lineId = hyPartnerBaseInfoService.getLineIdByIdCard(idCard); - return ResponseResult.success(lineId != null && lineId > 0L); + HyPartnerBaseInfoDO baseInfoDO = hyPartnerBaseInfoService.getByIdCard(idCard); + return ResponseResult.success(baseInfoDO != null && baseInfoDO.getPartnerLineId() > 0L); } @@ -136,7 +137,7 @@ public class PartnerController { @PostMapping(path = "/delCoolDownFirstLoginFlag") @ApiOperation("删除冷静期是否首次登录缓存") - public ResponseResult delCoolDownFirstLoginFlag(@RequestParam(value = "lineId",required = true)String lineId){ + public ResponseResult delCoolDownFirstLoginFlag(@RequestParam(value = "lineId",required = true)Long lineId){ String coolingPeriodFirstLoginCacheKey = MessageFormat.format(RedisConstant.COOLINGPERIOD_FIRSTLOGIN_KEY, lineId); redisUtilPool.delKey(coolingPeriodFirstLoginCacheKey); return ResponseResult.success(true); From 72a3bcc85032d260d12537c4820577e2d0d45abc 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 15:56:14 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E9=AB=98=E5=BE=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dao/HyPartnerBaseInfoDAO.java | 17 ++++++++++ .../store/mapper/HyPartnerBaseInfoMapper.java | 7 +++++ .../mapper/HyPartnerBaseInfoMapper.xml | 31 +++++++++++++++++++ .../mapper/HyPartnerLineInfoMapper.xml | 2 +- .../com/cool/store/service/GaoDeService.java | 17 ++++++++++ .../store/service/impl/GaoDeServiceImpl.java | 31 +++++++++++++++++++ .../impl/HyPartnerLineInfoServiceImpl.java | 14 ++++++++- .../cool/store/controller/TestController.java | 7 +++++ 8 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/GaoDeService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/GaoDeServiceImpl.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java index 59c49028e..5cdfcf475 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java @@ -2,10 +2,13 @@ package com.cool.store.dao; import com.cool.store.entity.HyPartnerBaseInfoDO; import com.cool.store.mapper.HyPartnerBaseInfoMapper; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * @Author suzhuhong @@ -25,6 +28,13 @@ public class HyPartnerBaseInfoDAO { return hyPartnerBaseInfoMapper.insertSelective(record); } + public int batchInsert( List records){ + if (CollectionUtils.isEmpty(records)){ + return 0; + } + return hyPartnerBaseInfoMapper.batchInsert(records); + } + /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 @@ -57,6 +67,13 @@ public class HyPartnerBaseInfoDAO { return hyPartnerBaseInfoMapper.getByPartnerLineId(partnerLineId); } + public List getByPartnerLineIds(List partnerLineId){ + if (CollectionUtils.isEmpty(partnerLineId)){ + return new ArrayList<>(); + } + return hyPartnerBaseInfoMapper.getByPartnerLineIds(partnerLineId); + } + public Long getLineIdByIdCard(String idCard){ if (StringUtils.isEmpty(idCard)){ return null; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java index 2d47cdf3c..22f149762 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java @@ -3,6 +3,8 @@ package com.cool.store.mapper; import com.cool.store.entity.HyPartnerBaseInfoDO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author zhangchenbiao * @date 2023-05-29 03:51 @@ -16,6 +18,8 @@ public interface HyPartnerBaseInfoMapper { */ int insertSelective(@Param("record") HyPartnerBaseInfoDO record); + int batchInsert(@Param("records") List records); + /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 @@ -38,6 +42,9 @@ public interface HyPartnerBaseInfoMapper { HyPartnerBaseInfoDO getByPartnerLineId(@Param("partnerLineId") Long partnerLineId); + + List getByPartnerLineIds(@Param("partnerLineId") List partnerLineIds); + Long getLineIdByIdCard(@Param("idCard") String idCard); int cleanIdCardInfoByPartnerLineId(@Param("idCard") String idCard, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml index a108097d9..b6415daac 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml @@ -27,6 +27,21 @@ id_card_photo_front, id_card_photo_black, live_address, user_portrait, status, latest_log_message, pass_reason, certify_file, create_time, update_time + + + insert into + hy_partner_base_info + ( + partner_id, + partner_line_id + ) + values + + (#{record.partnerId}, + #{record.partnerLineId} + + + insert into hy_partner_base_info @@ -142,6 +157,9 @@ + + + update hy_partner_base_info @@ -231,6 +249,19 @@ where partner_line_id = #{partnerLineId} + + - + insert into hy_partner_line_info ( 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 new file mode 100644 index 000000000..0bf437cdc --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/GaoDeService.java @@ -0,0 +1,17 @@ +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 new file mode 100644 index 000000000..e7704edf3 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/GaoDeServiceImpl.java @@ -0,0 +1,31 @@ +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-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 4f9b18ed3..2f98fb61a 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 @@ -29,6 +29,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.sql.Array; import java.text.MessageFormat; import java.util.*; import java.util.stream.Collectors; @@ -57,6 +58,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { EnterpriseUserService enterpriseUserService; @Resource AliyunService aliyunService; + @Resource + HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO; @Override public StageCountVO selectStagePendingCount(String userId) { @@ -141,6 +144,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { //过滤出已结束的线索 这块线索需要重新生成新的线索 List closeLineList = partnerLineInfoList.stream().filter(x -> x.getCloseTime() != null).collect(Collectors.toList()); List closeLineIdList = closeLineList.stream().map(HyPartnerLineInfoDO::getId).collect(Collectors.toList()); + //已结束的线索 需要重新生成一条新的线索 List list = new ArrayList<>(); closeLineList.stream().forEach(x->{ @@ -153,6 +157,14 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { list.add(hyPartnerLineInfoDO); }); hyPartnerLineInfoDAO.batchInsert(list); + List hyPartnerBaseInfoDOS = new ArrayList<>(); + list.forEach(x->{ + HyPartnerBaseInfoDO newHyPartnerBaseInfoDO = new HyPartnerBaseInfoDO(); + newHyPartnerBaseInfoDO.setPartnerId(x.getPartnerId()); + newHyPartnerBaseInfoDO.setPartnerLineId(x.getId()); + hyPartnerBaseInfoDOS.add(newHyPartnerBaseInfoDO); + }); + hyPartnerBaseInfoDAO.batchInsert(hyPartnerBaseInfoDOS); //将老的线索置为删除状态 hyPartnerLineInfoDAO.batchDeleted(closeLineIdList); //没有结束的线索直接分配招商经理 @@ -160,7 +172,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { List otherLineIdList = otherLineList.stream().map(HyPartnerLineInfoDO::getId).collect(Collectors.toList()); hyPartnerLineInfoDAO.updateInvestmentManager(userId, otherLineIdList); - return null; + return Boolean.TRUE; } @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 62ec2a36c..d2dd62549 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 @@ -25,6 +25,7 @@ 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; @@ -47,6 +48,8 @@ public class TestController { @Resource private EnterpriseUserService enterpriseUserService; @Resource + GaoDeService gaoDeService; + @Resource private ISVHttpRequest isvHttpRequest; @Resource private HyOpenAreaInfoMapper hyOpenAreaInfoMapper; @@ -239,4 +242,8 @@ public class TestController { return ResponseResult.success(enterpriseUserService.getDevelopmentByZoneId(zoneId)); } + @GetMapping("getGaoDePicture") + public ResponseResult getDevelopmentByZoneId(){ + return ResponseResult.success(gaoDeService.getGaoDePicture("")); + } } From d79be7c53a509b615a0647909da185d9b0477ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Wed, 21 Jun 2023 16:09:59 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E9=9D=A2=E8=AF=95=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E7=94=B3=E8=AF=B7&=E5=90=8C=E6=84=8F=E9=A2=84=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 1 + .../mapper/HyPartnerInterviewPlanMapper.xml | 1 + .../cool/store/request/InterviewSmsReq.java | 13 ++++ coolstore-partner-service/pom.xml | 5 ++ .../com/cool/store/service/SmsService.java | 13 ++++ .../store/service/impl/FlowServiceImpl.java | 6 +- .../service/impl/InterviewServiceImpl.java | 67 +++++++++++-------- .../store/service/impl/SmsServiceImpl.java | 55 +++++++++++++++ .../resources/application-local.properties | 5 ++ .../resources/application-local.properties | 6 +- 10 files changed, 136 insertions(+), 36 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/InterviewSmsReq.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/SmsService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/SmsServiceImpl.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index a691e1977..becb26e10 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -72,6 +72,7 @@ public enum ErrorCodeEnum { INTERVIEW_PLAN_ALREADY_EXIST(1021112, "面试计划已存在，请勿重复申请！", null), INTERVIEW_LINE_ID_IS_NULL(1021113, "线索id为空！", null), INTERVIEW_INTERVIEW_TIME_IS_UNUSABLE(1021114, "当前预约时间不可用，请和线索用户协商其他时间后确定预约时间\n面试人：{0} 手机号：{1}", null), + INTERVIEW_PARTNER_NOT_EXIST(1021115, "线索下的加盟商不存在！", null), SIGN_FAIL(600000, "验签失败", null), GET_ACCESSTOKEN_ERROR(600001, "获取小程序TOKEN错误！", null), NEW_MOBILE_HAS_EXIST(600002,"加盟商用户信息已存在",null), diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index d0e947807..32c95fdcd 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -302,6 +302,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 07/10] =?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 08/10] =?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 09/10] =?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 10/10] =?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); }