钱包提现

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/MyWalletCath.java

@@ -2,15 +2,15 @@ package com.github.wxiaoqi.security.admin.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 import javax.persistence.*;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
 /**
  * 钱包提现表
- * 
+ *
  * @author zjw
  * @email 18178966185@163.com
  * @date 2019-07-11 14:14:54
@@ -18,102 +18,100 @@ import lombok.Data;
 @Data
 @Table(name = "my_wallet_cath")
 public class MyWalletCath implements Serializable {
-	private static final long serialVersionUID = 1L;
-	
-	    /**
-    *  主键ID
-   */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
     @Id
-	@GeneratedValue(generator = "JDBC")
-	@ApiModelProperty("主键ID")
+    @GeneratedValue(generator = "JDBC")
+    @ApiModelProperty("主键ID")
     private Long id;
-	
-	    /**
-     *  用户iD
+
+    /**
+     * 用户iD
      */
     @Column(name = "user_id")
-	@ApiModelProperty(value = "用户iD")
+    @ApiModelProperty(value = "用户iD")
     private Integer userId;
-	
-	    /**
-     *  提现类别，第三方提现类别(0-微信，1-支付宝，2-银行卡)
+
+    /**
+     * 提现类别，第三方提现类别(0-微信，1-支付宝，2-银行卡)
      */
     @Column(name = "cath_type")
-	@ApiModelProperty(value = "提现类别，第三方提现类别(0-微信，1-支付宝，2-银行卡)")
+    @ApiModelProperty(value = "提现类别，第三方提现类别(0-微信，1-支付宝，2-银行卡)")
     private Integer cathType;
-	
-	    /**
-     *  商户订单号
-     */
+
+
     @Column(name = "account_number")
-	@ApiModelProperty(value = "用户账号")
+    @ApiModelProperty(value = "用户账号")
     private String accountNumber;
-	
-	    /**
-     *  第三方订单号：如微信，支付宝，银行卡等
+
+    /**
+     * 第三方订单号：如微信，支付宝，银行卡等
      */
     @Column(name = "cono")
-	@ApiModelProperty(value = "第三方订单号：如微信，支付宝，银行卡等")
+    @ApiModelProperty(value = "第三方订单号：如微信，支付宝，银行卡等")
     private String cono;
 
 
-	/**
-	 *  提现金额
-	 */
-	@Column(name = "balance")
-	@ApiModelProperty(value = "当前钱包余额")
-	private BigDecimal balance;
+    /**
+     * 提现金额
+     */
+    @Column(name = "balance")
+    @ApiModelProperty(value = "当前钱包余额")
+    private BigDecimal balance;
+
 
-	
     /**
-     *  提现金额
+     * 提现金额
      */
     @Column(name = "amount")
-	@ApiModelProperty(value = "提现金额")
+    @ApiModelProperty(value = "提现金额")
     private BigDecimal amount;
 
-	/**
-	 *  到账金额
-	 */
-	@Column(name = "real_amount")
-	@ApiModelProperty(value = "到账金额")
-	private BigDecimal realAmount;
-
-
-	/**
-	 *  手续费
-	 */
-	@Column(name = "commission")
-	@ApiModelProperty(value = "手续费")
-	private BigDecimal commission;
-	
-	    /**
-     *  订单状态：0-未提现,待审核，1-已审核
+    /**
+     * 到账金额
+     */
+    @Column(name = "real_amount")
+    @ApiModelProperty(value = "到账金额")
+    private BigDecimal realAmount;
+
+
+    /**
+     * 手续费
+     */
+    @Column(name = "commission")
+    @ApiModelProperty(value = "手续费")
+    private BigDecimal commission;
+
+    /**
+     * 订单状态：0-未提现,待审核，1-已审核
      */
     @Column(name = "stauts")
-	@ApiModelProperty(value = "订单状态：0-未提现,待审核，1-已审核")
+    @ApiModelProperty(value = "订单状态：0-未提现,待审核，1-已审核")
     private Integer stauts;
-	
-	    /**
-     *  提现日期
+
+    /**
+     * 提现日期
      */
     @Column(name = "crt_time")
-	@ApiModelProperty(value = "提现日期", hidden = true )
+    @ApiModelProperty(value = "提现日期", hidden = true)
     private Long crtTime;
-	
-	    /**
-     *  审核日期
+
+    /**
+     * 审核日期
      */
     @Column(name = "finish_time")
-	@ApiModelProperty(value = "审核日期")
+    @ApiModelProperty(value = "审核日期")
     private Long finishTime;
-	
-	    /**
-     *  操作者ID
+
+    /**
+     * 操作者ID
      */
     @Column(name = "upd_user")
-	@ApiModelProperty(value = "操作者ID")
+    @ApiModelProperty(value = "操作者ID")
     private String updUser;
-	
+
 
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletCathDetailVo.java

@@ -29,4 +29,7 @@ public class WalletCathDetailVo {
      */
     @ApiModelProperty(value = "审核日期")
     private Long finishTime;
+
+    @ApiModelProperty(value = "帐号")
+    private String accountNumber;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletCathBiz.java

@@ -12,7 +12,6 @@ import com.github.wxiaoqi.security.admin.vo.WalletCathPageVo;
 import com.github.wxiaoqi.security.admin.vo.WalletCathVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.google.common.collect.Maps;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;