余额审核列表

src/main/java/com/caimei/modules/user/dao/CmUserBalanceWithdrawalsDao.java → src/main/java/com/caimei/modules/balance/dao/CmUserBalanceWithdrawalsDao.java

@@ -1,8 +1,8 @@
-package com.caimei.modules.user.dao;
+package com.caimei.modules.balance.dao;
 
+import com.caimei.modules.balance.entity.CmUserBalanceWithdrawals;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.user.entity.CmUserBalanceWithdrawals;
 import org.apache.ibatis.annotations.Param;
 
 /**

src/main/java/com/caimei/modules/user/entity/CmUserBalanceWithdrawals.java → src/main/java/com/caimei/modules/balance/entity/CmUserBalanceWithdrawals.java

@@ -1,4 +1,4 @@
-package com.caimei.modules.user.entity;
+package com.caimei.modules.balance.entity;
 
 import org.hibernate.validator.constraints.Length;
 import java.util.Date;
@@ -7,22 +7,31 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.thinkgem.jeesite.common.persistence.DataEntity;
 
 /**
- * 会所余额提现Entity
- * @author lijun
- * @version 2019-11-12
+ * 审核列表Entity
+ * @author plf
+ * @version 2021-07-06
  */
 public class CmUserBalanceWithdrawals extends DataEntity<CmUserBalanceWithdrawals> {
 	
 	private static final long serialVersionUID = 1L;
-	private Integer userID;		// 用户ID（买家）
+	private Long userID;		// 用户ID（买家）
 	private String withdrawalsFee;		// 提现金额
 	private String bankAccountName;		// 银行账户名
 	private String bankAccountNo;		// 开户银行账户
 	private String openBank;		// 开户银行
 	private String bankAccountType;		// 账户类型：1公账，2私账
 	private String payType;		// 付款方式 1建设银行7297, 2中信银行0897, 3中信银行7172, 4广发银行0115, 5广发银行5461
-	private Date addDate;		// 提现时间
+	private String applicant;		// 申请人ID
+	private Date addDate;		// 申请时间
+	private String reviewer;		// 审核人ID
+	private Date reviewTime;		// 审核时间
+	private Date payTime;		// 转账时间
+	private String status;		// 审核状态 0待审核, 1审核通过 2审核不通过
+	private String reason;		// 审核不通过原因
 	private String remark;		// 备注
+	private String clubName;	//机构名称
+	private String startTime;	//开始时间
+	private String endTime;		//结束时间
 	
 	public CmUserBalanceWithdrawals() {
 		super();
@@ -32,11 +41,11 @@ public class CmUserBalanceWithdrawals extends DataEntity<CmUserBalanceWithdrawal
 		super(id);
 	}
 
-	public Integer getUserID() {
+	public Long getUserID() {
 		return userID;
 	}
 
-	public void setUserID(Integer userID) {
+	public void setUserID(Long userID) {
 		this.userID = userID;
 	}
 	
@@ -93,6 +102,14 @@ public class CmUserBalanceWithdrawals extends DataEntity<CmUserBalanceWithdrawal
 		this.payType = payType;
 	}
 	
+	public String getApplicant() {
+		return applicant;
+	}
+
+	public void setApplicant(String applicant) {
+		this.applicant = applicant;
+	}
+	
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	public Date getAddDate() {
 		return addDate;
@@ -102,6 +119,50 @@ public class CmUserBalanceWithdrawals extends DataEntity<CmUserBalanceWithdrawal
 		this.addDate = addDate;
 	}
 	
+	public String getReviewer() {
+		return reviewer;
+	}
+
+	public void setReviewer(String reviewer) {
+		this.reviewer = reviewer;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getReviewTime() {
+		return reviewTime;
+	}
+
+	public void setReviewTime(Date reviewTime) {
+		this.reviewTime = reviewTime;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getPayTime() {
+		return payTime;
+	}
+
+	public void setPayTime(Date payTime) {
+		this.payTime = payTime;
+	}
+	
+	@Length(min=1, max=1, message="审核状态 0待审核, 1审核通过 2审核不通过长度必须介于 1 和 1 之间")
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	
+	@Length(min=0, max=20, message="审核不通过原因长度必须介于 0 和 20 之间")
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+	
 	@Length(min=0, max=250, message="备注长度必须介于 0 和 250 之间")
 	public String getRemark() {
 		return remark;
@@ -110,5 +171,28 @@ public class CmUserBalanceWithdrawals extends DataEntity<CmUserBalanceWithdrawal
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
-	
+
+	public String getClubName() {
+		return clubName;
+	}
+
+	public void setClubName(String clubName) {
+		this.clubName = clubName;
+	}
+
+	public String getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+
+	public String getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
 }

src/main/java/com/caimei/modules/balance/service/CmUserBalanceWithdrawalsService.java

@@ -0,0 +1,61 @@
+package com.caimei.modules.balance.service;
+
+import com.caimei.modules.balance.dao.CmUserBalanceWithdrawalsDao;
+import com.caimei.modules.balance.entity.CmUserBalanceWithdrawals;
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.service.CrudService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 会所余额提现Service
+ *
+ * @author lijun
+ * @version 2019-11-12
+ */
+@Service
+@Transactional(readOnly = true)
+public class CmUserBalanceWithdrawalsService extends CrudService<CmUserBalanceWithdrawalsDao, CmUserBalanceWithdrawals> {
+
+    @Resource
+    CmUserBalanceWithdrawalsDao cmUserBalanceWithdrawalsDao;
+
+    public CmUserBalanceWithdrawals get(String id) {
+        return super.get(id);
+    }
+
+    public List<CmUserBalanceWithdrawals> findList(CmUserBalanceWithdrawals cmUserBalanceWithdrawals) {
+        return super.findList(cmUserBalanceWithdrawals);
+    }
+
+    public Page<CmUserBalanceWithdrawals> findPage(Page<CmUserBalanceWithdrawals> page, CmUserBalanceWithdrawals cmUserBalanceWithdrawals) {
+        Page<CmUserBalanceWithdrawals> withdrawalsPage = super.findPage(page, cmUserBalanceWithdrawals);
+        List<CmUserBalanceWithdrawals> withdrawalsList = withdrawalsPage.getList();
+        if (withdrawalsList != null && withdrawalsList.size() > 0) {
+            for (CmUserBalanceWithdrawals withdrawals : withdrawalsList) {
+
+            }
+
+        }
+        return withdrawalsPage;
+    }
+
+    @Transactional(readOnly = false)
+    public void save(CmUserBalanceWithdrawals cmUserBalanceWithdrawals) {
+        super.save(cmUserBalanceWithdrawals);
+    }
+
+    @Transactional(readOnly = false)
+    public void delete(CmUserBalanceWithdrawals cmUserBalanceWithdrawals) {
+        super.delete(cmUserBalanceWithdrawals);
+    }
+
+    @Transactional(readOnly = false)
+    public void deleteById(Integer id) {
+        cmUserBalanceWithdrawalsDao.deleteById(id);
+    }
+
+}

src/main/java/com/caimei/modules/balance/web/CmUserBalanceWithdrawalsController.java

@@ -0,0 +1,113 @@
+package com.caimei.modules.balance.web;
+
+import com.caimei.modules.balance.entity.CmUserBalanceWithdrawals;
+import com.caimei.modules.balance.service.CmUserBalanceWithdrawalsService;
+import com.caimei.modules.user.dao.CmUserDao;
+import com.caimei.modules.user.entity.CmUser;
+import com.caimei.modules.user.entity.CmUserBalanceRecord;
+import com.caimei.modules.user.service.CmUserBalanceRecordService;
+import com.thinkgem.jeesite.common.config.Global;
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.thinkgem.jeesite.common.web.BaseController;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+
+/**
+ * 会所余额提现Controller
+ *
+ * @author lijun
+ * @version 2019-11-12
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/balance/cmUserBalanceWithdrawals")
+public class CmUserBalanceWithdrawalsController extends BaseController {
+
+    @Autowired
+    private CmUserBalanceWithdrawalsService cmUserBalanceWithdrawalsService;
+    @Autowired
+    private CmUserBalanceRecordService cmUserBalanceRecordService;
+    @Resource
+    private CmUserDao cmUserDao;
+
+    @ModelAttribute
+    public CmUserBalanceWithdrawals get(@RequestParam(required = false) String id) {
+        CmUserBalanceWithdrawals entity = null;
+        if (StringUtils.isNotBlank(id)) {
+            entity = cmUserBalanceWithdrawalsService.get(id);
+        }
+        if (entity == null) {
+            entity = new CmUserBalanceWithdrawals();
+        }
+        return entity;
+    }
+
+    @RequiresPermissions("balance:cmUserBalanceWithdrawals:view")
+    @RequestMapping(value = {"list", ""})
+    public String list(CmUserBalanceWithdrawals cmUserBalanceWithdrawals, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<CmUserBalanceWithdrawals> page = cmUserBalanceWithdrawalsService.findPage(new Page<CmUserBalanceWithdrawals>(request, response), cmUserBalanceWithdrawals);
+        model.addAttribute("page", page);
+        return "modules/balance/cmUserBalanceWithdrawalsList";
+    }
+
+    @RequiresPermissions("balance:cmUserBalanceWithdrawals:view")
+    @RequestMapping(value = "form")
+    public String form(CmUserBalanceWithdrawals cmUserBalanceWithdrawals, Model model) {
+        model.addAttribute("cmUserBalanceWithdrawals", cmUserBalanceWithdrawals);
+        return "modules/balance/cmUserBalanceWithdrawalsForm";
+    }
+
+    @RequiresPermissions("balance:cmUserBalanceWithdrawals:edit")
+    @RequestMapping(value = "save")
+    public String save(CmUserBalanceWithdrawals cmUserBalanceWithdrawals, Model model, RedirectAttributes redirectAttributes) {
+        if (!beanValidator(model, cmUserBalanceWithdrawals)) {
+            return form(cmUserBalanceWithdrawals, model);
+        }
+        Date date = new Date();
+        Integer userID = cmUserBalanceWithdrawals.getUserID().intValue();
+        cmUserBalanceWithdrawals.setAddDate(date);
+        cmUserBalanceWithdrawalsService.save(cmUserBalanceWithdrawals);//保存提现记录
+        //添加余额收支记录
+        CmUserBalanceRecord cmUserBalanceRecord = new CmUserBalanceRecord();
+        cmUserBalanceRecord.setUserId(userID);
+        cmUserBalanceRecord.setType("2");
+        cmUserBalanceRecord.setBalanceType("5");
+        cmUserBalanceRecord.setAddDate(date);
+        cmUserBalanceRecord.setAmount(cmUserBalanceWithdrawals.getWithdrawalsFee());
+        cmUserBalanceRecord.setWithdrawalsId(Integer.parseInt(cmUserBalanceWithdrawals.getId()));//提现信息ID
+        cmUserBalanceRecord.setDelFlag("0");
+        cmUserBalanceRecordService.insertUserBalanceRecord(cmUserBalanceRecord);
+
+        //更新用户余额总金额
+        CmUser cmUser = cmUserDao.get(String.valueOf(userID));
+        String amount = cmUserBalanceWithdrawals.getWithdrawalsFee();//提现金额
+        double amountDouble = Double.parseDouble(amount);
+        cmUser.setUserID(userID);
+        cmUser.setAbleUserMoney(cmUser.getAbleUserMoney() - amountDouble);
+        cmUser.setUserMoney(cmUser.getUserMoney() - amountDouble);
+        cmUserDao.updateMoney(cmUser);
+
+        addMessage(redirectAttributes, "提现成功");
+        return "redirect:" + Global.getAdminPath() + "/user/cmUserBalanceRecord/userBalanceRecord?userId=" + userID;
+    }
+
+    @RequiresPermissions("balance:cmUserBalanceWithdrawals:delete")
+    @RequestMapping(value = "delete")
+    public String delete(CmUserBalanceWithdrawals cmUserBalanceWithdrawals, RedirectAttributes redirectAttributes) {
+        cmUserBalanceWithdrawalsService.delete(cmUserBalanceWithdrawals);
+        addMessage(redirectAttributes, "删除成功");
+        return "redirect:" + Global.getAdminPath() + "/user/cmUserBalanceWithdrawals/";
+    }
+
+}

src/main/java/com/caimei/modules/user/service/CmUserBalanceWithdrawalsService.java

@@ -1,53 +0,0 @@
-package com.caimei.modules.user.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.user.entity.CmUserBalanceWithdrawals;
-import com.caimei.modules.user.dao.CmUserBalanceWithdrawalsDao;
-
-import javax.annotation.Resource;
-
-/**
- * 会所余额提现Service
- * @author lijun
- * @version 2019-11-12
- */
-@Service
-@Transactional(readOnly = true)
-public class CmUserBalanceWithdrawalsService extends CrudService<CmUserBalanceWithdrawalsDao, CmUserBalanceWithdrawals> {
-
-	@Resource
-	CmUserBalanceWithdrawalsDao cmUserBalanceWithdrawalsDao;
-	public CmUserBalanceWithdrawals get(String id) {
-		return super.get(id);
-	}
-	
-	public List<CmUserBalanceWithdrawals> findList(CmUserBalanceWithdrawals cmUserBalanceWithdrawals) {
-		return super.findList(cmUserBalanceWithdrawals);
-	}
-	
-	public Page<CmUserBalanceWithdrawals> findPage(Page<CmUserBalanceWithdrawals> page, CmUserBalanceWithdrawals cmUserBalanceWithdrawals) {
-		return super.findPage(page, cmUserBalanceWithdrawals);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CmUserBalanceWithdrawals cmUserBalanceWithdrawals) {
-		super.save(cmUserBalanceWithdrawals);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CmUserBalanceWithdrawals cmUserBalanceWithdrawals) {
-		super.delete(cmUserBalanceWithdrawals);
-	}
-
-	@Transactional(readOnly = false)
-	public void deleteById(Integer id) {
-		cmUserBalanceWithdrawalsDao.deleteById(id);
-	}
-	
-}

src/main/java/com/caimei/modules/user/web/CmUserBalanceRecordController.java

@@ -1,16 +1,16 @@
 package com.caimei.modules.user.web;
 
+import com.caimei.modules.balance.entity.CmUserBalanceWithdrawals;
+import com.caimei.modules.balance.service.CmUserBalanceWithdrawalsService;
 import com.caimei.modules.order.dao.CmDiscernReceiptDao;
 import com.caimei.modules.order.dao.NewOrderDao;
 import com.caimei.modules.order.entity.NewOrder;
 import com.caimei.modules.user.dao.CmUserDao;
 import com.caimei.modules.user.entity.CmUser;
 import com.caimei.modules.user.entity.CmUserBalanceRecord;
-import com.caimei.modules.user.entity.CmUserBalanceWithdrawals;
 import com.caimei.modules.user.entity.CmUserOrganize;
 import com.caimei.modules.user.service.CmNormalUserService;
 import com.caimei.modules.user.service.CmUserBalanceRecordService;
-import com.caimei.modules.user.service.CmUserBalanceWithdrawalsService;
 import com.caimei.modules.user.service.CmUserOrganizeService;
 import com.google.common.collect.Maps;
 import com.thinkgem.jeesite.common.config.Global;

src/main/java/com/caimei/modules/user/web/CmUserBalanceWithdrawalsController.java

@@ -1,114 +0,0 @@
-package com.caimei.modules.user.web;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.caimei.modules.user.dao.CmUserDao;
-import com.caimei.modules.user.entity.CmUser;
-import com.caimei.modules.user.entity.CmUserBalanceRecord;
-import com.caimei.modules.user.service.CmUserBalanceRecordService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.caimei.modules.user.entity.CmUserBalanceWithdrawals;
-import com.caimei.modules.user.service.CmUserBalanceWithdrawalsService;
-
-import java.util.Date;
-
-/**
- * 会所余额提现Controller
- * @author lijun
- * @version 2019-11-12
- */
-@Controller
-@RequestMapping(value = "${adminPath}/user/cmUserBalanceWithdrawals")
-public class CmUserBalanceWithdrawalsController extends BaseController {
-
-	@Autowired
-	private CmUserBalanceWithdrawalsService cmUserBalanceWithdrawalsService;
-	@Autowired
-	private CmUserBalanceRecordService cmUserBalanceRecordService;
-	@Resource
-	private CmUserDao cmUserDao;
-	
-	@ModelAttribute
-	public CmUserBalanceWithdrawals get(@RequestParam(required=false) String id) {
-		CmUserBalanceWithdrawals entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = cmUserBalanceWithdrawalsService.get(id);
-		}
-		if (entity == null){
-			entity = new CmUserBalanceWithdrawals();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("user:cmUserBalanceWithdrawals:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(CmUserBalanceWithdrawals cmUserBalanceWithdrawals, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<CmUserBalanceWithdrawals> page = cmUserBalanceWithdrawalsService.findPage(new Page<CmUserBalanceWithdrawals>(request, response), cmUserBalanceWithdrawals); 
-		model.addAttribute("page", page);
-		return "modules/user/cmUserBalanceWithdrawalsList";
-	}
-
-	@RequiresPermissions("user:cmUserBalanceWithdrawals:view")
-	@RequestMapping(value = "form")
-	public String form(CmUserBalanceWithdrawals cmUserBalanceWithdrawals, Model model) {
-		model.addAttribute("cmUserBalanceWithdrawals", cmUserBalanceWithdrawals);
-		return "modules/user/cmUserBalanceWithdrawalsForm";
-	}
-
-	@RequiresPermissions("user:cmUserBalanceWithdrawals:edit")
-	@RequestMapping(value = "save")
-	public String save(CmUserBalanceWithdrawals cmUserBalanceWithdrawals, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, cmUserBalanceWithdrawals)){
-			return form(cmUserBalanceWithdrawals, model);
-		}
-		Date date = new Date();
-		Integer userID = cmUserBalanceWithdrawals.getUserID();
-		cmUserBalanceWithdrawals.setAddDate(date);
-		cmUserBalanceWithdrawalsService.save(cmUserBalanceWithdrawals);//保存提现记录
-		//添加余额收支记录
-		CmUserBalanceRecord cmUserBalanceRecord = new CmUserBalanceRecord();
-		cmUserBalanceRecord.setUserId(userID);
-		cmUserBalanceRecord.setType("2");
-		cmUserBalanceRecord.setBalanceType("5");
-		cmUserBalanceRecord.setAddDate(date);
-		cmUserBalanceRecord.setAmount(cmUserBalanceWithdrawals.getWithdrawalsFee());
-		cmUserBalanceRecord.setWithdrawalsId(Integer.parseInt(cmUserBalanceWithdrawals.getId()));//提现信息ID
-		cmUserBalanceRecord.setDelFlag("0");
-		cmUserBalanceRecordService.insertUserBalanceRecord(cmUserBalanceRecord);
-
-		//更新用户余额总金额
-		CmUser cmUser = cmUserDao.get(String.valueOf(userID));
-		String amount = cmUserBalanceWithdrawals.getWithdrawalsFee();//提现金额
-		double amountDouble = Double.parseDouble(amount);
-		cmUser.setUserID(userID);
-		cmUser.setAbleUserMoney(cmUser.getAbleUserMoney() - amountDouble );
-		cmUser.setUserMoney(cmUser.getUserMoney() - amountDouble);
-		cmUserDao.updateMoney(cmUser);
-
-		addMessage(redirectAttributes, "提现成功");
-		return "redirect:"+Global.getAdminPath()+"/user/cmUserBalanceRecord/userBalanceRecord?userId="+userID;
-	}
-	
-	@RequiresPermissions("user:cmUserBalanceWithdrawals:delete")
-	@RequestMapping(value = "delete")
-	public String delete(CmUserBalanceWithdrawals cmUserBalanceWithdrawals, RedirectAttributes redirectAttributes) {
-		cmUserBalanceWithdrawalsService.delete(cmUserBalanceWithdrawals);
-		addMessage(redirectAttributes, "删除成功");
-		return "redirect:"+Global.getAdminPath()+"/user/cmUserBalanceWithdrawals/";
-	}
-
-}

src/main/resources/mappings/modules/user/CmUserBalanceWithdrawalsMapper.xml → src/main/resources/mappings/modules/balance/CmUserBalanceWithdrawalsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.modules.user.dao.CmUserBalanceWithdrawalsDao">
+<mapper namespace="com.caimei.modules.balance.dao.CmUserBalanceWithdrawalsDao">
     
 	<sql id="cmUserBalanceWithdrawalsColumns">
 		a.id AS "id",
@@ -11,12 +11,20 @@
 		a.openBank AS "openBank",
 		a.bankAccountType AS "bankAccountType",
 		a.payType AS "payType",
+		a.applicant AS "applicant",
 		a.addDate AS "addDate",
+		a.reviewer AS "reviewer",
+		a.reviewTime AS "reviewTime",
+		a.payTime AS "payTime",
+		a.status AS "status",
+		a.reason AS "reason",
 		a.remark AS "remark",
-		a.delFlag AS "delFlag"
+		a.delFlag AS "delFlag",
+		u.name AS "clubName"
 	</sql>
 	
 	<sql id="cmUserBalanceWithdrawalsJoins">
+		LEFT JOIN USER u ON a.userID = u.userID
 	</sql>
     
 	<select id="get" resultType="CmUserBalanceWithdrawals">
@@ -33,12 +41,20 @@
 		FROM cm_user_balance_withdrawals a
 		<include refid="cmUserBalanceWithdrawalsJoins"/>
 		<where>
-			
 			<if test="id != null and id != ''">
 				AND a.id = #{id}
 			</if>
-			<if test="userID != null and userID != ''">
-				AND a.userID = #{userID}
+			<if test="clubName != null and clubName != ''">
+				AND u.name LIKE CONCAT('%',#{clubName},'%')
+			</if>
+			<if test="startTime != null and startTime != ''">
+				AND a.addDate <![CDATA[  >=  ]]> #{startTime}
+			</if>
+			<if test="endTime != null and endTime != ''">
+				AND a.addDate <![CDATA[  <=  ]]> #{endTime}
+			</if>
+			<if test="status != null">
+				AND a.status = #{status}
 			</if>
 		</where>
 		<choose>
@@ -46,6 +62,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
+				ORDER BY a.id DESC
 			</otherwise>
 		</choose>
 	</select>

src/main/webapp/WEB-INF/views/modules/balance/cmUserBalanceWithdrawalsList.jsp

@@ -0,0 +1,98 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>审核列表管理</title>
+	<meta name="decorator" content="default"/>
+	<style type="text/css">
+		.table th{text-align: center;}
+		.table td{text-align: center;}
+	</style>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			
+		});
+		function page(n,s){
+			$("#pageNo").val(n);
+			$("#pageSize").val(s);
+			$("#searchForm").submit();
+        	return false;
+        }
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li class="active"><a href="${ctx}/balance/cmUserBalanceWithdrawals/">余额提现列表</a></li>
+		<li><a href="${ctx}/user/cmUserBalanceRecord/userBalanceList">机构余额</a></li>
+	</ul>
+	<form:form id="searchForm" modelAttribute="cmUserBalanceWithdrawals" action="${ctx}/user/cmUserBalanceWithdrawals/" method="post" class="breadcrumb form-search">
+		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+		<div class="ul-form">
+			 <label>提现单ID：</label>
+				<form:input path="id" htmlEscape="false" class="input-medium"/>
+			<label>机构名称：</label>
+				<form:input path="clubName" htmlEscape="false" maxlength="20" class="input-medium"/>
+			 <label>申请时间：</label>
+			<input name="startTime" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
+				   value="<fmt:formatDate value="${testData.beginInDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+				   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/> -
+			<input name="endTime" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
+				   value="<fmt:formatDate value="${testData.endInDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+				   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/><br><br>
+			<label>审核状态：</label>
+			<form:select path="status" class="input-medium required" style="width:80px">
+				<form:option value="" label="全部"/>
+				<form:option value="0" label="待审核"/>
+				<form:option value="1" label="审核通过"/>
+				<form:option value="2" label="审核不通过"/>
+			</form:select>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+			<div class="clearfix"></div>
+		</div>
+	</form:form>
+	<sys:message content="${message}"/>
+	<table id="contentTable" class="table table-striped table-bordered table-condensed">
+		<thead>
+			<tr>
+				<th>提现单ID</th>
+				<th>机构名称</th>
+				<th>提现金额</th>
+				<th>申请人</th>
+				<th>申请时间</th>
+				<th>审核人</th>
+				<th>审核时间</th>
+				<th>审核状态 0待审核, 1审核通过 2审核不通过</th>
+				<th>操作</th>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach items="${page.list}" var="cmUserBalanceWithdrawals">
+			<tr>
+				<td>${cmUserBalanceWithdrawals.id}</td>
+				<td>${cmUserBalanceWithdrawals.clubName}</td>
+				<td>${cmUserBalanceWithdrawals.withdrawalsFee}</td>
+				<td></td>
+				<td>
+					<fmt:formatDate value="${cmUserBalanceWithdrawals.addDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+				</td>
+				<td></td>
+				<td>
+					<fmt:formatDate value="${cmUserBalanceWithdrawals.reviewTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+				</td>
+				<td>
+					${cmUserBalanceWithdrawals.status}
+				</td>
+				<shiro:hasPermission name="user:cmUserBalanceWithdrawals:edit"><td>
+    				<a href="${ctx}/user/cmUserBalanceWithdrawals/form?id=${cmUserBalanceWithdrawals.id}">编辑</a>
+    				<shiro:hasPermission name="user:cmUserBalanceWithdrawals:delete">
+					<a href="${ctx}/user/cmUserBalanceWithdrawals/delete?id=${cmUserBalanceWithdrawals.id}" onclick="return confirmx('确认要删除该审核列表吗？', this.href)">删除</a>
+					</shiro:hasPermission>
+				</td></shiro:hasPermission>
+			</tr>
+		</c:forEach>
+		</tbody>
+	</table>
+	<div class="pagination">${page}</div>
+</body>
+</html>

src/main/webapp/WEB-INF/views/modules/user/cmUserBalanceList.jsp

@@ -69,6 +69,7 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
+		<li><a href="${ctx}/balance/cmUserBalanceWithdrawals/">余额提现列表</a></li>
 		<li class="active"><a href="${ctx}/user/cmUserBalanceRecord/userBalanceList">机构余额</a></li>
 	</ul>
 	<form:form id="searchForm" modelAttribute="cmUser" action="${ctx}/user/cmUserBalanceRecord/userBalanceList" method="post" class="breadcrumb form-search">