feature-img-1.0:统一接口名称，艺术家账户字段更正

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")
+    @TableField(value = "account_no")
-    @ApiModelProperty(value="支付宝账号")
+    @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->支付宝)

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="支付宝账号(加密)")
+    @ApiModelProperty(value="账户账号(加密)")
-    private String aliPayNo;
+    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())){
+        if(StringUtils.isNotBlank(this.getAccountNo())){
-            creatorAccount.setBankNo(Sm4Util.sm4Encryption(this.getBankNo()));
+            creatorAccount.setAccountNo(Sm4Util.sm4Encryption(this.getAccountNo()));
-        }
-        if(StringUtils.isNotBlank(this.getAliPayNo())){
-            creatorAccount.setAliPayNo(Sm4Util.sm4Encryption(this.getAliPayNo()));
         }
         return creatorAccount;
     }

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="银行卡(加密)")
+    @ApiModelProperty(value="账户账号(加密)")
-    @Desensitized(type = SensitiveTypeEnum.BANK_CARD)
-    private String bankNo;
-
-    @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;
 }

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

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

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

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

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

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

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())){
+            if(StringUtils.isNotBlank(creatorAccount.getAccountNo())){
-                creatorAccount.setBankNo(Sm4Util.sm4Decrypt(creatorAccount.getBankNo()));
+                creatorAccount.setAccountNo(Sm4Util.sm4Decrypt(creatorAccount.getAccountNo()));
-            }
-            if(StringUtils.isNotBlank(creatorAccount.getAliPayNo())){
-                creatorAccount.setAliPayNo(Sm4Util.sm4Decrypt(creatorAccount.getAliPayNo()));
             }
             JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccount), CreatorAccount.class);
         }
@@ -68,11 +65,11 @@ public class CreatorAccountServiceImpl implements CreatorAccountService {
         List<CreatorAccountVo> creatorAccountVos = creatorAccountMapper.queryFrontList(creatorId);
         for (CreatorAccountVo creatorAccountVo : creatorAccountVos) {
             creatorAccountVo.setName(creatorAccountVo.getName());
-            if(StringUtils.isNotBlank(creatorAccountVo.getBankNo())){
+            if(StringUtils.isNotBlank(creatorAccountVo.getIdNo())){
-                creatorAccountVo.setBankNo(Sm4Util.sm4Decrypt(creatorAccountVo.getBankNo()));
+                creatorAccountVo.setIdNo(Sm4Util.sm4Decrypt(creatorAccountVo.getIdNo()));
             }
-            if(StringUtils.isNotBlank(creatorAccountVo.getAliPayNo())){
+            if(StringUtils.isNotBlank(creatorAccountVo.getAccountNo())){
-                creatorAccountVo.setAliPayNo(Sm4Util.sm4Decrypt(creatorAccountVo.getAliPayNo()));
+                creatorAccountVo.setAccountNo(Sm4Util.sm4Decrypt(creatorAccountVo.getAccountNo()));
             }
             JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccountVo), CreatorAccountVo.class);
         }

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

@@ -8,23 +8,23 @@
     <result column="creator_id" jdbcType="BIGINT" property="creatorId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <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="account_no" jdbcType="VARCHAR" property="accountNo" />
     <result column="is_show" jdbcType="CHAR" property="isShow" />
+    <result column="is_use" jdbcType="CHAR" property="isUse" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="sort" jdbcType="INTEGER" property="sort" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    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
   </sql>
 
   <select id="queryFrontList" resultType="com.bnyer.common.core.vo.CreatorAccountVo">
         select
-          id, creator_id,name,bank_no,alipay_no,type
+          id, creator_id,name,id_no,account_no,type,is_use
         from img_creator_account
         where is_show = '1' and creator_id = #{creatorId}
   </select>