feature1.0.0-img: 补充艺术家账户接口，提现接口

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";
+
 }

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));
     }

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;
 }

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;
     }
 }

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;
 }

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;
+}

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天内重新发起审核

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<CreatorAccount> creatorAccounts = creatorAccountMapper.selectList(wrapper);
         for (CreatorAccount creatorAccount : creatorAccounts) {
             creatorAccount.setIdNo(Sm4Util.sm4Decrypt(creatorAccount.getIdNo()));
             creatorAccount.setPhone(Sm4Util.sm4Decrypt(creatorAccount.getPhone()));
             creatorAccount.setName(creatorAccount.getName());
+            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());
+            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<CreatorAccountVo> creatorAccountVos = creatorAccountMapper.queryFrontList(creatorId);
         for (CreatorAccountVo creatorAccountVo : creatorAccountVos) {
             creatorAccountVo.setName(creatorAccountVo.getName());
+            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;

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.*;
-import com.bnyer.img.dto.CreatorPageDto;
-import com.bnyer.img.dto.VerifyDto;
-import com.bnyer.img.dto.WxLoginDto;
 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");

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;
     }
 

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;
 }

bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml

@@ -10,6 +10,8 @@
     <result column="id_no" jdbcType="VARCHAR" property="idNo" />
     <result column="bank_no" jdbcType="VARCHAR" property="bankNo" />
     <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="type" jdbcType="CHAR" property="type" />
+    <result column="alipay_no" jdbcType="VARCHAR" property="aliPayNo" />
     <result column="is_show" jdbcType="CHAR" property="isShow" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -17,12 +19,12 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    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
   </sql>
 
   <select id="queryFrontList" resultType="com.bnyer.img.vo.CreatorAccountVo">
         select
-          id, creator_id,name,bank_no
+          id, creator_id,name,bank_no,alipay_no,type
         from img_creator_account
         where is_show = '1' and creator_id = #{creatorId}
   </select>