linxk před 2 týdny
rodič
revize
08e201f00d

+ 7 - 10
cif-service/src/main/java/com/txz/cif/model/RechargeRecord.java

@@ -132,22 +132,19 @@ public class RechargeRecord {
     private String version;
 
 
-    @Column(name = "bank_name")
+    @Column(name = "bank")
     @ApiModelProperty(value="银行")
-    private String bankName;
+    private String bank;
 
     /**
      * 用户名
      */
-    @Column(name = "account_name")
+    @Column(name = "bank_account_name")
     @ApiModelProperty(value="银行账号姓名")
-    private String accountName;
+    private String bankAccountName;
 
-    /**
-     * 手机号
-     */
-    @Column(name = "recharge_account")
-    @ApiModelProperty(value="充值账号")
-    private String rechargeAccount;
+    @Column(name = "bank_account")
+    @ApiModelProperty(value="银行")
+    private String bankAccount;
 
 }

+ 15 - 0
cif-service/src/main/java/com/txz/cif/model/WithdrawRecord.java

@@ -130,5 +130,20 @@ public class WithdrawRecord {
     @ApiModelProperty(value="version版本号")
     private String version;
 
+    @Column(name = "bank")
+    @ApiModelProperty(value="银行")
+    private String bank;
+
+    /**
+     * 用户名
+     */
+    @Column(name = "bank_account_name")
+    @ApiModelProperty(value="银行账号姓名")
+    private String bankAccountName;
+
+    @Column(name = "bank_account")
+    @ApiModelProperty(value="银行")
+    private String bankAccount;
+
 
 }

+ 3 - 0
cif-service/src/main/java/com/txz/cif/web/RechargeRecordApiController.java

@@ -82,6 +82,9 @@ public class RechargeRecordApiController {
 					.amount(goods.getAmount())
 					.currency("BDT").userId(userId)
 					.userName(user.getName()).userPhone(user.getPhoneNo())
+					.bank(user.getBank())
+					.bankAccount(user.getBankAccount())
+					.bankAccountName(user.getBankAccountName())
 					.orderNo(orderNo).goodsId(goodsId)
 					.status(1).createTime(DateUtil.date())
 					.build();

+ 3 - 0
cif-service/src/main/java/com/txz/cif/web/WithdrawRecordApiController.java

@@ -119,6 +119,9 @@ public class WithdrawRecordApiController {
 			withdrawRecord.setUserId(userId);
 			withdrawRecord.setAccountType(param.getAccountType());
 			withdrawRecord.setFee(fee);
+			withdrawRecord.setBank(user.getBank());
+			withdrawRecord.setBankAccount(user.getBankAccount());
+			withdrawRecord.setBankAccountName(user.getBankAccountName());
 			withdrawRecord.setChannel(param.getChannel());
 			withdrawRecord.setCurrency(param.getCurrency());
 			withdrawRecord.setAmount(param.getAmount());

+ 12 - 0
cif-service/src/main/java/com/txz/cif/web/bo/UserInfoBO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import javax.persistence.Column;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -104,4 +105,15 @@ public class UserInfoBO {
     private BigDecimal L7DEarnings;
 
 
+    @ApiModelProperty(value="银行")
+    private String bank;
+
+    /**
+     * 用户名
+     */
+    @ApiModelProperty(value="银行账号姓名")
+    private String bankAccountName;
+
+    @ApiModelProperty(value="银行")
+    private String bankAccount;
 }

+ 5 - 0
cif-service/src/main/java/com/txz/cif/web/para/UserUpdateParam.java

@@ -37,6 +37,8 @@ public class UserUpdateParam {
     @ApiModelProperty(value="银行")
     private String bank;
 
+
+
     /**
      * 邮箱
      */
@@ -49,6 +51,9 @@ public class UserUpdateParam {
     @ApiModelProperty(value="银行账户")
     private String bankAccount;
 
+    @ApiModelProperty(value="银行账户姓名")
+    private String bankAccountName;
+
     /**
      * 居住地址
      */

+ 3 - 3
cif-service/src/main/resources/mapper/RechargeRecordMapper.xml

@@ -25,11 +25,11 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="version" jdbcType="VARCHAR" property="version" />
 
-    <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
+    <result column="bank" jdbcType="VARCHAR" property="bank" />
 
-    <result column="account_name" jdbcType="VARCHAR" property="accountName" />
+    <result column="bank_account_name" jdbcType="VARCHAR" property="bankAccountName" />
 
-    <result column="recharge_account" jdbcType="VARCHAR" property="rechargeAccount" />
+    <result column="bank_account" jdbcType="VARCHAR" property="bankAccount" />
 
 
 

+ 7 - 0
cif-service/src/main/resources/mapper/WithdrawRecordMapper.xml

@@ -23,5 +23,12 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="version" jdbcType="VARCHAR" property="version" />
+
+    <result column="bank" jdbcType="VARCHAR" property="bank" />
+
+    <result column="bank_account_name" jdbcType="VARCHAR" property="bankAccountName" />
+
+    <result column="bank_account" jdbcType="VARCHAR" property="bankAccount" />
+
   </resultMap>
 </mapper>