diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java index 2d42e05..c17e7c2 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java @@ -47,14 +47,6 @@ public class CreatorAccount extends BaseDomain { @Desensitized(type = SensitiveTypeEnum.ID_CARD) private String idNo; - /** - * 银行卡(加密) - */ - @TableField(value = "bank_no") - @ApiModelProperty(value="银行卡(加密)") - @Desensitized(type = SensitiveTypeEnum.BANK_CARD) - private String bankNo; - /** * 联系电话 */ @@ -64,12 +56,19 @@ public class CreatorAccount extends BaseDomain { private String phone; /** - * 支付宝账号 + * 账户账号 */ - @TableField(value = "alipay_no") - @ApiModelProperty(value="支付宝账号") + @TableField(value = "account_no") + @ApiModelProperty(value="账户账号") @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE) - private String aliPayNo; + private String accountNo; + + /** + * 默认使用(0->未使用;1->使用中) + */ + @TableField(value = "is_use") + @ApiModelProperty(value="默认使用(0->未使用;1->使用中)") + private String isUse; /** * 类型(0->银行卡;1->支付宝) diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java index 9f5a900..20cd40e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java @@ -35,18 +35,14 @@ public class CreatorAccountDto implements Serializable { @ApiModelProperty(value="身份证(加密)") private String idNo; - @Desensitized(type = SensitiveTypeEnum.BANK_CARD) - @ApiModelProperty(value="银行卡(加密)") - private String bankNo; - @NotBlank(message = "联系电话不能为空!") @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE) @ApiModelProperty(value="联系电话") private String phone; @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE) - @ApiModelProperty(value="支付宝账号(加密)") - private String aliPayNo; + @ApiModelProperty(value="账户账号(加密)") + private String accountNo; @ApiModelProperty(value="类型") private String type; @@ -59,11 +55,8 @@ public class CreatorAccountDto implements Serializable { 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())); + if(StringUtils.isNotBlank(this.getAccountNo())){ + creatorAccount.setAccountNo(Sm4Util.sm4Encryption(this.getAccountNo())); } return creatorAccount; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java index 216164b..9ba392c 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java @@ -24,16 +24,19 @@ public class CreatorAccountVo implements Serializable { @Desensitized(type = SensitiveTypeEnum.CHINESE_NAME) private String name; - @ApiModelProperty(value="银行卡(加密)") - @Desensitized(type = SensitiveTypeEnum.BANK_CARD) - private String bankNo; - - @ApiModelProperty(value="支付宝账号(加密)") + @ApiModelProperty(value="账户账号(加密)") @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE) - private String aliPayNo; + private String accountNo; + + @ApiModelProperty(value="身份证(加密)") + @Desensitized(type = SensitiveTypeEnum.ID_CARD) + private String idNo; @ApiModelProperty(value="类型") private String type; + @ApiModelProperty(value="默认使用(0->未使用;1->使用中)") + private String isUse; + private static final long serialVersionUID = 1L; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CommonController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CommonController.java index 17b79c9..8275599 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CommonController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CommonController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; -@Api(value = "【图文平台】公共接口",tags = "【图文平台】公共接口") +@Api(value = "【小程序】公共接口",tags = "【小程序】公共接口") @RestController @RequestMapping("/img/common") @Slf4j 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 8ff4459..ade1c74 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 @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "【微信小程序】艺术家接口",tags = "【微信小程序】艺术家接口") +@Api(value = "【微信小程序】艺术家端接口",tags = "【微信小程序】艺术家端接口") @RestController @RequestMapping("/img/mini/creator") @Slf4j diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java index 8095817..ecda898 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@Api(value = "【快手小程序】接口",tags = "【快手小程序】接口") +@Api(value = "【快手小程序】用户端接口",tags = "【快手小程序】用户端接口") @RestController @RequestMapping("/img/mini/fh") @Slf4j diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java index 72b3427..c3a758f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@Api(value = "【抖音小程序】接口",tags = "【抖音小程序】接口") +@Api(value = "【抖音小程序】用户端接口",tags = "【抖音小程序】用户端接口") @RestController @RequestMapping("/img/mini/tiktok") @Slf4j diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java index b217336..d79b827 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@Api(value = "【微信小程序】接口",tags = "【微信小程序】接口") +@Api(value = "【微信小程序】用户端接口",tags = "【微信小程序】用户端接口") @RestController @RequestMapping("/img/mini/wx") @Slf4j diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/YunmeiController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/YunmeiController.java index c694a88..905e8fe 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/YunmeiController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/YunmeiController.java @@ -13,7 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -@Api(value = "【图文平台】云媒影视接口",tags = "【图文平台】云媒影视接口") +@Api(value = "【小程序】云媒影视接口",tags = "【小程序】云媒影视接口") @RestController @RequestMapping("/img/yunmei") @Slf4j 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 39d052b..aec3c99 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 @@ -52,11 +52,8 @@ 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())); + if(StringUtils.isNotBlank(creatorAccount.getAccountNo())){ + creatorAccount.setAccountNo(Sm4Util.sm4Decrypt(creatorAccount.getAccountNo())); } JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccount), CreatorAccount.class); } @@ -68,11 +65,11 @@ public class CreatorAccountServiceImpl implements CreatorAccountService { List 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.getIdNo())){ + creatorAccountVo.setIdNo(Sm4Util.sm4Decrypt(creatorAccountVo.getIdNo())); } - if(StringUtils.isNotBlank(creatorAccountVo.getAliPayNo())){ - creatorAccountVo.setAliPayNo(Sm4Util.sm4Decrypt(creatorAccountVo.getAliPayNo())); + if(StringUtils.isNotBlank(creatorAccountVo.getAccountNo())){ + creatorAccountVo.setAccountNo(Sm4Util.sm4Decrypt(creatorAccountVo.getAccountNo())); } JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccountVo), CreatorAccountVo.class); } 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 cfca3a6..2ab38f1 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 @@ -8,23 +8,23 @@ - - + + - id, creator_id, `name`, id_no, bank_no, phone,alipay_no,type, create_time, update_time, sort,is_show + id, creator_id, `name`, id_no, phone,account_no,type,is_use, create_time, update_time, sort,is_show