From 083e10eeda7a103a72184e6996a456f52a6eb525 Mon Sep 17 00:00:00 2001 From: penny <2500338766@qq.com> Date: Wed, 29 Jun 2022 22:16:41 +0800 Subject: [PATCH] =?UTF-8?q?feature1.0.0-img:=20=E8=A1=A5=E5=85=85=E8=89=BA?= =?UTF-8?q?=E6=9C=AF=E5=AE=B6=E8=B4=A6=E6=88=B7=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bnyer/img/constants/WithdrawConstant.java | 15 +++++++++ .../img/controller/CreatorController.java | 4 +-- .../com/bnyer/img/domain/CreatorAccount.java | 15 +++++++++ .../com/bnyer/img/dto/CreatorAccountDto.java | 17 ++++++++-- .../bnyer/img/dto/CreatorAccountPageDto.java | 7 ++++ .../com/bnyer/img/dto/VerifyCreatorDto.java | 32 +++++++++++++++++++ .../com/bnyer/img/service/CreatorService.java | 4 +-- .../impl/CreatorAccountServiceImpl.java | 27 ++++++++++++++-- .../img/service/impl/CreatorServiceImpl.java | 9 ++---- .../service/impl/WithdrawLogServiceImpl.java | 7 ++-- .../com/bnyer/img/vo/CreatorAccountVo.java | 7 ++++ .../bnyer/img/mapper/CreatorAccountMapper.xml | 6 ++-- 12 files changed, 131 insertions(+), 19 deletions(-) create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyCreatorDto.java diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/WithdrawConstant.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/WithdrawConstant.java index 1049816..f230aa3 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/WithdrawConstant.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/WithdrawConstant.java @@ -16,4 +16,19 @@ public class WithdrawConstant { */ public static final String UNPASS = "0"; + /** + * 提现到微信 + */ + public static final String WECHAT = "0"; + + /** + * 提现到银行卡 + */ + public static final String BANK = "1"; + + /** + * 提现到支付宝 + */ + public static final String ALIPAY = "2"; + } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java index 418eda3..e7ca535 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java @@ -99,7 +99,7 @@ public class CreatorController extends BaseController { //@RequiresPermissions("system:config:list") @ApiOperation(value="审核通过") @PostMapping(value = "/verifyPass") - public AjaxResult verifyPass(@Validated @RequestBody @ApiParam("审核对象") VerifyDto dto){ + public AjaxResult verifyPass(@Validated @RequestBody @ApiParam("审核对象") VerifyCreatorDto dto){ log.debug("【图文平台后台】审核通过参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(creatorService.verifyPass(dto)); } @@ -107,7 +107,7 @@ public class CreatorController extends BaseController { //@RequiresPermissions("system:config:list") @ApiOperation(value="审核拒绝") @PostMapping(value = "/verifyUnPass") - public AjaxResult verifyUnPass(@Validated @RequestBody @ApiParam("审核对象") VerifyDto dto){ + public AjaxResult verifyUnPass(@Validated @RequestBody @ApiParam("审核对象") VerifyCreatorDto dto){ log.debug("【图文平台后台】审核不通过参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(creatorService.verifyUnPass(dto)); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorAccount.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorAccount.java index 5fe8abe..993bb91 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorAccount.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorAccount.java @@ -63,5 +63,20 @@ public class CreatorAccount extends BaseDomain { @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE) private String phone; + /** + * 支付宝账号 + */ + @TableField(value = "alipay_no") + @ApiModelProperty(value="支付宝账号") + @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE) + private String aliPayNo; + + /** + * 类型(0->银行卡;1->支付宝) + */ + @TableField(value = "type") + @ApiModelProperty(value="类型(0->银行卡;1->支付宝)") + private String type; + private static final long serialVersionUID = 1L; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountDto.java index a0e9ea1..69e172e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountDto.java @@ -3,6 +3,7 @@ package com.bnyer.img.dto; import com.bnyer.common.core.annotation.Desensitized; import com.bnyer.common.core.enums.SensitiveTypeEnum; import com.bnyer.common.core.utils.Sm4Util; +import com.bnyer.common.core.utils.StringUtils; import com.bnyer.img.domain.CreatorAccount; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -34,7 +35,6 @@ public class CreatorAccountDto implements Serializable { @ApiModelProperty(value="身份证(加密)") private String idNo; - @NotBlank(message = "银行卡不能为空!") @Desensitized(type = SensitiveTypeEnum.BANK_CARD) @ApiModelProperty(value="银行卡(加密)") private String bankNo; @@ -44,14 +44,27 @@ public class CreatorAccountDto implements Serializable { @ApiModelProperty(value="联系电话") private String phone; + @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE) + @ApiModelProperty(value="支付宝账号(加密)") + private String aliPayNo; + + @ApiModelProperty(value="类型") + private String type; + public CreatorAccount extractParam(){ CreatorAccount creatorAccount = new CreatorAccount(); creatorAccount.setId(this.getId()); creatorAccount.setCreatorId(this.getCreatorId()); - creatorAccount.setBankNo(Sm4Util.sm4Encryption(this.getBankNo())); creatorAccount.setName(this.getName()); creatorAccount.setPhone(Sm4Util.sm4Encryption(this.getPhone())); creatorAccount.setIdNo(Sm4Util.sm4Encryption(this.getIdNo())); + creatorAccount.setType(this.getType()); + if(StringUtils.isNotBlank(this.getBankNo())){ + creatorAccount.setBankNo(Sm4Util.sm4Encryption(this.getBankNo())); + } + if(StringUtils.isNotBlank(this.getAliPayNo())){ + creatorAccount.setAliPayNo(Sm4Util.sm4Encryption(this.getAliPayNo())); + } return creatorAccount; } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountPageDto.java index 376d33e..f9ecd9a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountPageDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountPageDto.java @@ -24,10 +24,17 @@ public class CreatorAccountPageDto extends BasePageDto { @ApiModelProperty(value="联系电话") private String phone; + @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE) + @ApiModelProperty(value="支付宝账号(加密)") + private String aliPayNo; + @Desensitized(type = SensitiveTypeEnum.CHINESE_NAME) @ApiModelProperty(value="姓名(加密)") private String name; @ApiModelProperty(value="是否显示") private String isShow; + + @ApiModelProperty(value="类型") + private String type; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyCreatorDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyCreatorDto.java new file mode 100644 index 0000000..501cabe --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyCreatorDto.java @@ -0,0 +1,32 @@ +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; + +/** + * @author chengkun + * @date 2022/5/31 9:43 + */ +@Getter +@Setter +@ApiModel("审核艺术家接收类") +public class VerifyCreatorDto implements Serializable { + + @NotNull(message = "主键id不能为空!") + @ApiModelProperty(value="主键") + private Long id; + + @NotNull(message = "管理员id不能为空!") + @ApiModelProperty(value="管理员id") + private Long adminId; + + @NotBlank(message = "审核原因不能为空!") + @ApiModelProperty(value="审核原因") + private String reason; +} 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 8c944aa..952b6e0 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 @@ -74,14 +74,14 @@ public interface CreatorService { * @param params 审核参数 * @return - */ - int verifyPass(VerifyDto params); + int verifyPass(VerifyCreatorDto params); /** * 审核不通过 * @param params 审核参数 * @return - */ - int verifyUnPass(VerifyDto params); + int verifyUnPass(VerifyCreatorDto params); /** * 10天内重新发起审核 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorAccountServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorAccountServiceImpl.java index 13a2b18..0a7a37e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorAccountServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorAccountServiceImpl.java @@ -62,16 +62,27 @@ public class CreatorAccountServiceImpl implements CreatorAccountService { if(StringUtils.isNotBlank(dto.getPhone())){ wrapper.eq(CreatorAccount::getPhone, Sm4Util.sm4Encryption(dto.getPhone())); } + if(StringUtils.isNotBlank(dto.getAliPayNo())){ + wrapper.eq(CreatorAccount::getAliPayNo, Sm4Util.sm4Encryption(dto.getAliPayNo())); + } if(StringUtils.isNotBlank(dto.getIsShow())){ wrapper.eq(CreatorAccount::getIsShow, dto.getIsShow()); } + if(StringUtils.isNotBlank(dto.getType())){ + wrapper.eq(CreatorAccount::getType, dto.getType()); + } wrapper.orderByDesc(CreatorAccount::getSort); List creatorAccounts = creatorAccountMapper.selectList(wrapper); for (CreatorAccount creatorAccount : creatorAccounts) { creatorAccount.setIdNo(Sm4Util.sm4Decrypt(creatorAccount.getIdNo())); creatorAccount.setPhone(Sm4Util.sm4Decrypt(creatorAccount.getPhone())); creatorAccount.setName(creatorAccount.getName()); - creatorAccount.setBankNo(Sm4Util.sm4Decrypt(creatorAccount.getBankNo())); + if(StringUtils.isNotBlank(creatorAccount.getBankNo())){ + creatorAccount.setBankNo(Sm4Util.sm4Decrypt(creatorAccount.getBankNo())); + } + if(StringUtils.isNotBlank(creatorAccount.getAliPayNo())){ + creatorAccount.setAliPayNo(Sm4Util.sm4Decrypt(creatorAccount.getAliPayNo())); + } JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccount), CreatorAccount.class); } return creatorAccounts; @@ -84,7 +95,12 @@ public class CreatorAccountServiceImpl implements CreatorAccountService { creatorAccount.setIdNo(Sm4Util.sm4Decrypt(creatorAccount.getIdNo())); creatorAccount.setPhone(Sm4Util.sm4Decrypt(creatorAccount.getPhone())); creatorAccount.setName(creatorAccount.getName()); - creatorAccount.setBankNo(Sm4Util.sm4Decrypt(creatorAccount.getBankNo())); + if(StringUtils.isNotBlank(creatorAccount.getBankNo())){ + creatorAccount.setBankNo(Sm4Util.sm4Decrypt(creatorAccount.getBankNo())); + } + if(StringUtils.isNotBlank(creatorAccount.getAliPayNo())){ + creatorAccount.setAliPayNo(Sm4Util.sm4Decrypt(creatorAccount.getAliPayNo())); + } JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccount), CreatorAccount.class); } return creatorAccount; @@ -95,7 +111,12 @@ public class CreatorAccountServiceImpl implements CreatorAccountService { List creatorAccountVos = creatorAccountMapper.queryFrontList(creatorId); for (CreatorAccountVo creatorAccountVo : creatorAccountVos) { creatorAccountVo.setName(creatorAccountVo.getName()); - creatorAccountVo.setBankNo(Sm4Util.sm4Decrypt(creatorAccountVo.getBankNo())); + if(StringUtils.isNotBlank(creatorAccountVo.getBankNo())){ + creatorAccountVo.setBankNo(Sm4Util.sm4Decrypt(creatorAccountVo.getBankNo())); + } + if(StringUtils.isNotBlank(creatorAccountVo.getAliPayNo())){ + creatorAccountVo.setAliPayNo(Sm4Util.sm4Decrypt(creatorAccountVo.getAliPayNo())); + } JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccountVo), CreatorAccountVo.class); } return creatorAccountVos; 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 de55f99..1de677a 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 @@ -19,10 +19,7 @@ import com.bnyer.img.domain.Creator; import com.bnyer.img.domain.InviteLog; import com.bnyer.img.domain.TiktokImg; import com.bnyer.img.domain.VerifyLog; -import com.bnyer.img.dto.CreatorDto; -import com.bnyer.img.dto.CreatorPageDto; -import com.bnyer.img.dto.VerifyDto; -import com.bnyer.img.dto.WxLoginDto; +import com.bnyer.img.dto.*; import com.bnyer.img.mapper.CreatorMapper; import com.bnyer.img.mapper.InviteLogMapper; import com.bnyer.img.mapper.TiktokImgMapper; @@ -226,7 +223,7 @@ public class CreatorServiceImpl implements CreatorService { @Override @Transactional(rollbackFor = Exception.class) - public int verifyPass(VerifyDto params) { + public int verifyPass(VerifyCreatorDto params) { //修改状态 Creator creator = creatorMapper.selectById(params.getId()); creator.setStatus("1"); @@ -245,7 +242,7 @@ public class CreatorServiceImpl implements CreatorService { @Override @Transactional(rollbackFor = Exception.class) - public int verifyUnPass(VerifyDto params) { + public int verifyUnPass(VerifyCreatorDto params) { //修改状态 Creator creator = creatorMapper.selectById(params.getId()); creator.setStatus("2"); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java index fe47458..f0161a5 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java @@ -145,8 +145,11 @@ public class WithdrawLogServiceImpl implements WithdrawLogService { withdrawLog.setStatus("1"); withdrawLog.setUpdateTime(new Date()); int update = withdrawLogMapper.updateById(withdrawLog); - //TODO 此处审核通过，调用微信企业付款到零钱方法 - + //TODO + //此处审核通过，调用支付宝企业付款到用户处方法 + if(withdrawLog.getChannel().equals(WithdrawConstant.ALIPAY)){ + //根据用户id查询其支付宝账户及其真实名称 + } return update; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorAccountVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorAccountVo.java index 7b5f9c7..0913774 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorAccountVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorAccountVo.java @@ -28,5 +28,12 @@ public class CreatorAccountVo implements Serializable { @Desensitized(type = SensitiveTypeEnum.BANK_CARD) private String bankNo; + @ApiModelProperty(value="支付宝账号(加密)") + @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE) + private String aliPayNo; + + @ApiModelProperty(value="类型") + private String type; + private static final long serialVersionUID = 1L; } diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml index fd4c748..ca5bae0 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml @@ -10,6 +10,8 @@ + + @@ -17,12 +19,12 @@ - id, creator_id, `name`, id_no, bank_no, phone, create_time, update_time, sort,is_show + id, creator_id, `name`, id_no, bank_no, phone,alipay_no,type, create_time, update_time, sort,is_show