diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java index 870f465..06bcc35 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java +++ b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java @@ -27,9 +27,6 @@ public class TiktokImgMiniDto implements Serializable { @ApiModelProperty(value="分类id") private Long typeId; - /** - * 状态(0->待审核;1->审核通过) - */ @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)") private String status; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java index 9fd2970..182e6ad 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java @@ -3,6 +3,7 @@ package com.bnyer.img.controller; import com.alibaba.fastjson.JSON; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; +import com.bnyer.img.constants.TiktokConstant; import com.bnyer.img.domain.TiktokImg; import com.bnyer.img.dto.*; import com.bnyer.img.service.*; @@ -54,10 +55,49 @@ public class CreatorMiniController extends BaseController { private CreatorProfitService creatorProfitService; //@TokenCheck - @ApiOperation(value="成为艺术家") + @ApiOperation(value="检查手机号是否重复") + @PostMapping(value = "/checkPhone") + public AjaxResult checkPhone(@Validated @RequestBody @ApiParam("手机号对象") CheckPhoneDto dto){ + log.debug("【艺术家小程序】检查手机号是否重复参数为:{}", JSON.toJSONString(dto)); + boolean b = creatorService.checkPhone(dto.getPhone()); + if(b){ + return AjaxResult.error(TiktokConstant.BINDED_PHONE,"当前手机号已绑定艺术家,请重新编辑!"); + }else{ + return AjaxResult.success(); + } + } + + //@TokenCheck + @ApiOperation(value="检查搜索码是否重复") + @PostMapping(value = "/checkScanCode") + public AjaxResult checkScanCode(@Validated @RequestBody @ApiParam("搜索码对象") CheckScanCodeDto dto){ + log.debug("【艺术家小程序】检查搜索码是否重复参数为:{}", JSON.toJSONString(dto)); + boolean b = creatorService.checkScanCode(dto.getScanCode()); + if(b){ + return AjaxResult.error(TiktokConstant.SCAN_CODE_REPEAT,"搜索码重复,请重新编辑!"); + }else{ + return AjaxResult.success(); + } + } + + //@TokenCheck + @ApiOperation(value="检查邀请码是否存在") + @PostMapping(value = "/checkInviteCode") + public AjaxResult checkInviteCode(@Validated @RequestBody @ApiParam("邀请码对象") CheckInviteCodeDto dto){ + log.debug("【艺术家小程序】检查邀请码是否存在参数为:{}", JSON.toJSONString(dto)); + boolean b = creatorService.checkInviteCode(dto.getInviteCode()); + if(b){ + return AjaxResult.success(); + }else{ + return AjaxResult.error(TiktokConstant.INVITE_CODE_NOT_EXIST,"邀请码不存在,请联系客服!"); + } + } + + //@TokenCheck + @ApiOperation(value="注册艺术家") @PostMapping(value = "/insertCreator") public AjaxResult insertCreator(@Validated @RequestBody @ApiParam("艺术家对象") CreatorDto dto){ - log.info("【艺术家小程序】成为艺术家参数为:{}", JSON.toJSONString(dto)); + log.info("【艺术家小程序】注册艺术家参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(creatorService.insertCreator(dto)); } @@ -100,9 +140,7 @@ public class CreatorMiniController extends BaseController { @PostMapping(value = "/insertTiktokImg") public AjaxResult insertTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto){ log.info("【艺术家小程序】艺术家【{}】新增图片参数为:{}",dto.getCreatorId(),JSON.toJSONString(dto)); - TiktokImg tiktokImg = dto.extractParam(); - tiktokImg.setStatus("0"); - return AjaxResult.success(tiktokImgService.insert(tiktokImg)); + return AjaxResult.success(tiktokImgService.insert(dto.extractParam())); } //@TokenCheck diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckInviteCodeDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckInviteCodeDto.java new file mode 100644 index 0000000..2be2fd2 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckInviteCodeDto.java @@ -0,0 +1,20 @@ +package com.bnyer.img.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("邀请码接收类") +public class CheckInviteCodeDto implements Serializable { + + @NotBlank(message = "邀请码不能为空！") + @ApiModelProperty(value="邀请码") + private String inviteCode; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckPhoneDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckPhoneDto.java new file mode 100644 index 0000000..cab16f2 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckPhoneDto.java @@ -0,0 +1,20 @@ +package com.bnyer.img.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("手机号接收类") +public class CheckPhoneDto implements Serializable { + + @NotBlank(message = "手机号不能为空！") + @ApiModelProperty(value="手机号") + private String phone; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckScanCodeDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckScanCodeDto.java new file mode 100644 index 0000000..146b9b1 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckScanCodeDto.java @@ -0,0 +1,21 @@ +package com.bnyer.img.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("搜索码接收类") +public class CheckScanCodeDto implements Serializable { + + @NotBlank(message = "搜索码不能为空！") + @ApiModelProperty(value="搜索码") + private String scanCode; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDto.java index ecb6a07..fa8eaef 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDto.java @@ -30,7 +30,7 @@ public class CreatorDto implements Serializable { @ApiModelProperty(value="密码") private String password; - @NotBlank(message = "头像不能为空!") + //@NotBlank(message = "头像不能为空!") @ApiModelProperty(value="头像img地址") private String img; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java index 91ace0c..ceab1f0 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java @@ -27,6 +27,9 @@ public class TiktokImgMiniDto implements Serializable { @ApiModelProperty(value="分类id") private Long typeId; + @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)") + private String status; + public TiktokImg extractParam(){ TiktokImg tiktokImg = new TiktokImg(); BeanUtils.copyProperties(this,tiktokImg); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java index 0f25f05..34cc14a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java @@ -122,4 +122,25 @@ public interface CreatorService { * @return - */ Map queryCreatorScanCodeById(Long id); + + /** + * 检查用户是否绑定过手机号 + * @param phone 手机号 + * @return - + */ + boolean checkPhone(String phone); + + /** + * 检查搜索码是否重复 + * @param scanCode 搜索码 + * @return - + */ + boolean checkScanCode(String scanCode); + + /** + * 检查邀请码是否存在 + * @param inviteCode 邀请码 + * @return - + */ + boolean checkInviteCode(String inviteCode); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java index 407b26a..4ce856c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java @@ -70,16 +70,10 @@ public class CreatorServiceImpl implements CreatorService { @Autowired private WxConfig wxConfig; - - - /** - * 检查用户是否绑定过手机号 - * @param phone 手机号 - * @return - - */ - private boolean checkPhone(String phone){ + @Override + public boolean checkPhone(String phone){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Creator::getPhone, phone); + wrapper.eq(Creator::getPhone, Sm4Util.sm4Encryption(StringUtils.trim(phone))); List creators = creatorMapper.selectList(wrapper); if(creators.size() > 0){ return true; @@ -88,14 +82,10 @@ public class CreatorServiceImpl implements CreatorService { } } - /** - * 检查搜索码是否重复 - * @param scanCode 搜索码 - * @return - - */ - private boolean checkScanCode(String scanCode){ + @Override + public boolean checkScanCode(String scanCode){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Creator::getScanCode, scanCode); + wrapper.eq(Creator::getScanCode, StringUtils.trim(scanCode)); List creators = creatorMapper.selectList(wrapper); if(creators.size() > 0){ return true; @@ -104,44 +94,37 @@ public class CreatorServiceImpl implements CreatorService { } } - /** - * 检查邀请码是否存在 - * @param inviteCode 邀请码 - * @return - - */ - private Creator checkInviteCode(String inviteCode){ + @Override + public boolean checkInviteCode(String inviteCode){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Creator::getInviteCode, inviteCode); - return creatorMapper.selectOne(wrapper); + wrapper.eq(Creator::getInviteCode, StringUtils.trim(inviteCode)); + Creator creators = creatorMapper.selectOne(wrapper); + if(creators != null){ + return true; + }else{ + return false; + } } @Override @Transactional(rollbackFor = Exception.class) public int insertCreator(CreatorDto dto) { - //检查手机号是否存在 - boolean b1 = checkPhone(Sm4Util.sm4Encryption(dto.getPhone())); - if(b1){ - throw new ServiceException("当前手机号已绑定艺术家,请重新编辑!", TiktokConstant.BINDED_PHONE); - } - //检查搜索码是否重复 - boolean b = this.checkScanCode(dto.getScanCode()); - if(b){ - throw new ServiceException("搜索码重复,请重新编辑！",TiktokConstant.SCAN_CODE_REPEAT); - } //检查邀请码是否存在 - Creator creatorProtoType = this.checkInviteCode(dto.getInviteCode()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Creator::getInviteCode, StringUtils.trim(dto.getInviteCode())); + Creator creatorProtoType = creatorMapper.selectOne(wrapper); if(creatorProtoType == null){ throw new ServiceException("邀请码不存在,请重新编辑！",TiktokConstant.INVITE_CODE_NOT_EXIST); } Creator creator = new Creator(); - creator.setName(dto.getName()); - creator.setPassword(Sm4Util.sm4Encryption(dto.getPassword())); - creator.setImg(dto.getImg()); - creator.setIntro(dto.getIntro()); - creator.setScanCode(dto.getScanCode()); + creator.setName(StringUtils.trim(dto.getName())); + creator.setPassword(Sm4Util.sm4Encryption(StringUtils.trim(dto.getPassword()))); + creator.setImg(StringUtils.trim(dto.getImg())); + creator.setIntro(StringUtils.trim(dto.getIntro())); + creator.setScanCode(StringUtils.trim(dto.getScanCode())); creator.setInviteCode(IdUtils.inviteCodeGen()); - creator.setUrl(dto.getUrl()); - creator.setPhone(Sm4Util.sm4Encryption(dto.getPhone())); + creator.setUrl(StringUtils.trim(dto.getUrl())); + creator.setPhone(Sm4Util.sm4Encryption(StringUtils.trim(dto.getPhone()))); creator.setIsHot("0"); creator.setStatus("0"); creator.setIsShow("1"); @@ -150,10 +133,10 @@ public class CreatorServiceImpl implements CreatorService { creator.setCreateTime(new Date()); creator.setUpdateTime(new Date()); int insert = creatorMapper.insert(creator); - log.info("手机号【{}】成为艺术家成功!待审核",dto.getPhone()); + log.info("手机号【{}】成为艺术家成功!待审核",StringUtils.trim(dto.getPhone())); //保存邀请记录 InviteLog inviteLog = new InviteLog(); - inviteLog.setInviteCode(dto.getInviteCode()); + inviteLog.setInviteCode(StringUtils.trim(dto.getInviteCode())); inviteLog.setInvitedCreatorId(creator.getId()); inviteLog.setCreatorId(creatorProtoType.getId()); inviteLog.setCreateTime(new Date()); @@ -161,7 +144,7 @@ public class CreatorServiceImpl implements CreatorService { inviteLog.setUpdateTime(new Date()); inviteLog.setSort(0); inviteLogMapper.insert(inviteLog); - log.info("艺术家id【{}】被邀请码【{}】邀请成功!记录写入数据库完成!",creator.getId(),dto.getInviteCode()); + log.info("艺术家id【{}】被邀请码【{}】邀请成功!记录写入数据库完成!",creator.getId(),StringUtils.trim(dto.getInviteCode())); return insert; }