提现信息

ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxMemberController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.business.ajax;
 
+import com.ruoyi.business.domain.BizCashInfo;
 import com.ruoyi.business.domain.BizMember;
 import com.ruoyi.business.domain.BizMemberAddress;
 import com.ruoyi.business.service.IBizMemberAddressService;
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -19,10 +21,10 @@ import java.util.Map;
 @RequestMapping("/ajax/member")
 public class AjaxMemberController extends AuthController {
 
-    @Autowired
+    @Resource
     private IBizMemberService bizMemberService;
 
-    @Autowired
+    @Resource
     private IBizMemberAddressService bizMemberAddressService;
 
     //个人中心
@@ -88,4 +90,27 @@ public class AjaxMemberController extends AuthController {
         }
         return AjaxResult.success(bizMemberAddressService.deleteBizMemberAddressById(addressID));
     }
+
+    //提现信息
+    @PostMapping("/getCashInfo")
+    public AjaxResult getCashInfo(int type)
+    {
+        return null;
+    }
+
+    //提现申请
+    @PostMapping("/addCashInfo")
+    public AjaxResult addCashInfo(BizCashInfo bizCashInfo)
+    {
+
+        return null;
+    }
+
+    //我的提现信息列表
+    @PostMapping("/listCashInfo")
+    public AjaxResult listCashInfo()
+    {
+
+        return null;
+    }
 }

ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxOrderController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
@@ -17,16 +18,16 @@ import java.util.Map;
 @RequestMapping("/ajax/order")
 public class AjaxOrderController extends AuthController {
 
-    @Autowired
+    @Resource
     private IBizOrderService bizOrderService;
 
-    @Autowired
+    @Resource
     private IBizProductService bizProductService;
 
-    @Autowired
+    @Resource
     private IBizMemberService bizMemberService;
 
-    @Autowired
+    @Resource
     private IBizMemberAddressService bizMemberAddressService;
 
 

ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxProductController.java

@@ -26,10 +26,10 @@ import java.util.*;
 @RequestMapping("/ajax/product")
 public class AjaxProductController extends AuthController {
 
-    @Autowired
+    @Resource
     private IBizProductService bizProductService;
 
-    @Autowired
+    @Resource
     private IBizProductTypeService bizProductTypeService;
 
     //分类和推荐商品

ruoyi-business/src/main/java/com/ruoyi/business/controller/BizCashInfoController.java

@@ -0,0 +1,91 @@
+package com.ruoyi.business.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.business.domain.BizCashInfo;
+import com.ruoyi.business.service.IBizCashInfoService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import javax.annotation.Resource;
+
+/**
+ * 兑现申请记录Controller
+ * 
+ * @author ruoyi
+ * @date 2020-09-23
+ */
+@Controller
+@RequestMapping("/business/cash")
+public class BizCashInfoController extends BaseController
+{
+    private String prefix = "business/cash";
+
+    @Resource
+    private IBizCashInfoService bizCashInfoService;
+
+    @RequiresPermissions("business:cash:view")
+    @GetMapping()
+    public String cash()
+    {
+        return prefix + "/cash";
+    }
+
+    /**
+     * 查询兑现申请记录列表
+     */
+    @RequiresPermissions("business:cash:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(BizCashInfo bizCashInfo)
+    {
+        startPage();
+        List<BizCashInfo> list = bizCashInfoService.selectBizCashInfoList(bizCashInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出兑现申请记录列表
+     */
+    @RequiresPermissions("business:cash:export")
+    @Log(title = "兑现申请记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(BizCashInfo bizCashInfo)
+    {
+        List<BizCashInfo> list = bizCashInfoService.selectBizCashInfoList(bizCashInfo);
+        ExcelUtil<BizCashInfo> util = new ExcelUtil<BizCashInfo>(BizCashInfo.class);
+        return util.exportExcel(list, "cash");
+    }
+
+    /**
+     * 批准兑现申请记录
+     */
+    @RequiresPermissions("business:cash:edit")
+    @Log(title = "兑现申请记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/agree")
+    @ResponseBody
+    public AjaxResult agreeInfo(Long cashInfoID)
+    {
+        BizCashInfo cashInfo = bizCashInfoService.selectBizCashInfoById(cashInfoID);
+        if (cashInfo.getStatus() == BizCashInfo.CASH_INFO_STATUS_INITIAL) {
+            cashInfo.setStatus(BizCashInfo.CASH_INFO_STATUS_AGREE);
+            bizCashInfoService.updateBizCashInfo(cashInfo);
+        }
+        return AjaxResult.success();
+    }
+
+
+}

ruoyi-business/src/main/java/com/ruoyi/business/domain/BizCashInfo.java

@@ -0,0 +1,183 @@
+package com.ruoyi.business.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 兑现申请记录对象 biz_cash_info
+ * 
+ * @author ruoyi
+ * @date 2020-09-23
+ */
+public class BizCashInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    //提现申请状态
+    public static final int CASH_INFO_STATUS_INITIAL = 0;
+    public static final int CASH_INFO_STATUS_AGREE = 1;
+    public static final int CASH_INFO_STATUS_DENY = 2;
+
+    /** 兑现申请ID */
+    private Long id;
+
+    /** 会员ID */
+    private Long memberId;
+
+    /** 会员姓名 */
+    @Excel(name = "会员姓名")
+    private String memberName;
+
+    /** 会员账户ID */
+    private Long accountId;
+
+    /** 账户类型 */
+    @Excel(name = "账户类型")
+    private Integer accountType;
+
+    /** 开户银行 */
+    @Excel(name = "开户银行")
+    private Integer bankId;
+
+    /** 开户人 */
+    @Excel(name = "开户人")
+    private String bankUser;
+
+    /** 开户地 */
+    @Excel(name = "开户地")
+    private String bankCity;
+
+    /** 卡号 */
+    @Excel(name = "卡号")
+    private String bankCard;
+
+    /** 提现金额 */
+    @Excel(name = "提现金额")
+    private Integer drawMoney;
+
+    /** 0-默认 1-通过 2-驳回 */
+    @Excel(name = "0-默认 1-通过 2-驳回")
+    private Integer status;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setMemberId(Long memberId) 
+    {
+        this.memberId = memberId;
+    }
+
+    public Long getMemberId() 
+    {
+        return memberId;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public void setAccountId(Long accountId)
+    {
+        this.accountId = accountId;
+    }
+
+    public Long getAccountId() 
+    {
+        return accountId;
+    }
+    public void setAccountType(Integer accountType) 
+    {
+        this.accountType = accountType;
+    }
+
+    public Integer getAccountType() 
+    {
+        return accountType;
+    }
+    public void setBankId(Integer bankId) 
+    {
+        this.bankId = bankId;
+    }
+
+    public Integer getBankId() 
+    {
+        return bankId;
+    }
+    public void setBankUser(String bankUser) 
+    {
+        this.bankUser = bankUser;
+    }
+
+    public String getBankUser() 
+    {
+        return bankUser;
+    }
+    public void setBankCity(String bankCity) 
+    {
+        this.bankCity = bankCity;
+    }
+
+    public String getBankCity() 
+    {
+        return bankCity;
+    }
+    public void setBankCard(String bankCard) 
+    {
+        this.bankCard = bankCard;
+    }
+
+    public String getBankCard() 
+    {
+        return bankCard;
+    }
+    public void setDrawMoney(Integer drawMoney) 
+    {
+        this.drawMoney = drawMoney;
+    }
+
+    public Integer getDrawMoney() 
+    {
+        return drawMoney;
+    }
+    public void setStatus(Integer status) 
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus() 
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("memberId", getMemberId())
+            .append("accountId", getAccountId())
+            .append("accountType", getAccountType())
+            .append("bankId", getBankId())
+            .append("bankUser", getBankUser())
+            .append("bankCity", getBankCity())
+            .append("bankCard", getBankCard())
+            .append("drawMoney", getDrawMoney())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizCashInfoMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.business.mapper;
+
+import java.util.List;
+import com.ruoyi.business.domain.BizCashInfo;
+
+/**
+ * 兑现申请记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2020-09-23
+ */
+public interface BizCashInfoMapper 
+{
+    /**
+     * 查询兑现申请记录
+     * 
+     * @param id 兑现申请记录ID
+     * @return 兑现申请记录
+     */
+    public BizCashInfo selectBizCashInfoById(Long id);
+
+    /**
+     * 查询兑现申请记录列表
+     * 
+     * @param bizCashInfo 兑现申请记录
+     * @return 兑现申请记录集合
+     */
+    public List<BizCashInfo> selectBizCashInfoList(BizCashInfo bizCashInfo);
+
+    /**
+     * 新增兑现申请记录
+     * 
+     * @param bizCashInfo 兑现申请记录
+     * @return 结果
+     */
+    public int insertBizCashInfo(BizCashInfo bizCashInfo);
+
+    /**
+     * 修改兑现申请记录
+     * 
+     * @param bizCashInfo 兑现申请记录
+     * @return 结果
+     */
+    public int updateBizCashInfo(BizCashInfo bizCashInfo);
+
+    /**
+     * 删除兑现申请记录
+     * 
+     * @param id 兑现申请记录ID
+     * @return 结果
+     */
+    public int deleteBizCashInfoById(Long id);
+
+    /**
+     * 批量删除兑现申请记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBizCashInfoByIds(String[] ids);
+}

ruoyi-business/src/main/java/com/ruoyi/business/service/IBizCashInfoService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.business.service;
+
+import java.util.List;
+import com.ruoyi.business.domain.BizCashInfo;
+
+/**
+ * 兑现申请记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2020-09-23
+ */
+public interface IBizCashInfoService 
+{
+    /**
+     * 查询兑现申请记录
+     * 
+     * @param id 兑现申请记录ID
+     * @return 兑现申请记录
+     */
+    public BizCashInfo selectBizCashInfoById(Long id);
+
+    /**
+     * 查询兑现申请记录列表
+     * 
+     * @param bizCashInfo 兑现申请记录
+     * @return 兑现申请记录集合
+     */
+    public List<BizCashInfo> selectBizCashInfoList(BizCashInfo bizCashInfo);
+
+    /**
+     * 新增兑现申请记录
+     * 
+     * @param bizCashInfo 兑现申请记录
+     * @return 结果
+     */
+    public int insertBizCashInfo(BizCashInfo bizCashInfo);
+
+    /**
+     * 修改兑现申请记录
+     * 
+     * @param bizCashInfo 兑现申请记录
+     * @return 结果
+     */
+    public int updateBizCashInfo(BizCashInfo bizCashInfo);
+
+    /**
+     * 批量删除兑现申请记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBizCashInfoByIds(String ids);
+
+    /**
+     * 删除兑现申请记录信息
+     * 
+     * @param id 兑现申请记录ID
+     * @return 结果
+     */
+    public int deleteBizCashInfoById(Long id);
+}

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizCashInfoServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.business.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.business.mapper.BizCashInfoMapper;
+import com.ruoyi.business.domain.BizCashInfo;
+import com.ruoyi.business.service.IBizCashInfoService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 兑现申请记录Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2020-09-23
+ */
+@Service
+public class BizCashInfoServiceImpl implements IBizCashInfoService 
+{
+    @Autowired
+    private BizCashInfoMapper bizCashInfoMapper;
+
+    /**
+     * 查询兑现申请记录
+     * 
+     * @param id 兑现申请记录ID
+     * @return 兑现申请记录
+     */
+    @Override
+    public BizCashInfo selectBizCashInfoById(Long id)
+    {
+        return bizCashInfoMapper.selectBizCashInfoById(id);
+    }
+
+    /**
+     * 查询兑现申请记录列表
+     * 
+     * @param bizCashInfo 兑现申请记录
+     * @return 兑现申请记录
+     */
+    @Override
+    public List<BizCashInfo> selectBizCashInfoList(BizCashInfo bizCashInfo)
+    {
+        return bizCashInfoMapper.selectBizCashInfoList(bizCashInfo);
+    }
+
+    /**
+     * 新增兑现申请记录
+     * 
+     * @param bizCashInfo 兑现申请记录
+     * @return 结果
+     */
+    @Override
+    public int insertBizCashInfo(BizCashInfo bizCashInfo)
+    {
+        bizCashInfo.setCreateTime(DateUtils.getNowDate());
+        return bizCashInfoMapper.insertBizCashInfo(bizCashInfo);
+    }
+
+    /**
+     * 修改兑现申请记录
+     * 
+     * @param bizCashInfo 兑现申请记录
+     * @return 结果
+     */
+    @Override
+    public int updateBizCashInfo(BizCashInfo bizCashInfo)
+    {
+        bizCashInfo.setUpdateTime(DateUtils.getNowDate());
+        return bizCashInfoMapper.updateBizCashInfo(bizCashInfo);
+    }
+
+    /**
+     * 删除兑现申请记录对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBizCashInfoByIds(String ids)
+    {
+        return bizCashInfoMapper.deleteBizCashInfoByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除兑现申请记录信息
+     * 
+     * @param id 兑现申请记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBizCashInfoById(Long id)
+    {
+        return bizCashInfoMapper.deleteBizCashInfoById(id);
+    }
+}

ruoyi-business/src/main/resources/mapper/business/BizCashInfoMapper.xml

@@ -0,0 +1,112 @@
+<?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.ruoyi.business.mapper.BizCashInfoMapper">
+    
+    <resultMap type="BizCashInfo" id="BizCashInfoResult">
+        <result property="id"    column="id"    />
+        <result property="memberId"    column="member_id"    />
+        <result property="accountId"    column="account_id"    />
+        <result property="accountType"    column="account_type"    />
+        <result property="bankId"    column="bank_id"    />
+        <result property="bankUser"    column="bank_user"    />
+        <result property="bankCity"    column="bank_city"    />
+        <result property="bankCard"    column="bank_card"    />
+        <result property="drawMoney"    column="draw_money"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectBizCashInfoVo">
+        select a.id, a.member_id, (concat(b.member_name, b.mobile)) memberName, account_id, account_type, bank_id, bank_user, bank_city, bank_card, draw_money, status, a.create_by, a.create_time, a.update_by, a.update_time from biz_cash_info a
+        left join biz_member b on a.member_id = b.id
+    </sql>
+
+    <select id="selectBizCashInfoList" parameterType="BizCashInfo" resultMap="BizCashInfoResult">
+        <include refid="selectBizCashInfoVo"/>
+        <where>  
+            <if test="memberId != null "> and member_id = #{memberId}</if>
+            <if test="memberName != null and memberName != ''"> and (b.member_name like concat('%', #{memberName}, '%') or b.mobile like concat('%', #{memberName}, '%'))</if>
+            <if test="accountId != null "> and account_id = #{accountId}</if>
+            <if test="accountType != null "> and account_type = #{accountType}</if>
+            <if test="bankId != null "> and bank_id = #{bankId}</if>
+            <if test="status != null "> and status = #{status}</if>
+        </where>
+        order by id desc
+    </select>
+    
+    <select id="selectBizCashInfoById" parameterType="Long" resultMap="BizCashInfoResult">
+        <include refid="selectBizCashInfoVo"/>
+        where a.id = #{id}
+    </select>
+        
+    <insert id="insertBizCashInfo" parameterType="BizCashInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into biz_cash_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="memberId != null">member_id,</if>
+            <if test="accountId != null">account_id,</if>
+            <if test="accountType != null">account_type,</if>
+            <if test="bankId != null">bank_id,</if>
+            <if test="bankUser != null and bankUser != ''">bank_user,</if>
+            <if test="bankCity != null and bankCity != ''">bank_city,</if>
+            <if test="bankCard != null and bankCard != ''">bank_card,</if>
+            <if test="drawMoney != null">draw_money,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="memberId != null">#{memberId},</if>
+            <if test="accountId != null">#{accountId},</if>
+            <if test="accountType != null">#{accountType},</if>
+            <if test="bankId != null">#{bankId},</if>
+            <if test="bankUser != null and bankUser != ''">#{bankUser},</if>
+            <if test="bankCity != null and bankCity != ''">#{bankCity},</if>
+            <if test="bankCard != null and bankCard != ''">#{bankCard},</if>
+            <if test="drawMoney != null">#{drawMoney},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBizCashInfo" parameterType="BizCashInfo">
+        update biz_cash_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="memberId != null">member_id = #{memberId},</if>
+            <if test="accountId != null">account_id = #{accountId},</if>
+            <if test="accountType != null">account_type = #{accountType},</if>
+            <if test="bankId != null">bank_id = #{bankId},</if>
+            <if test="bankUser != null and bankUser != ''">bank_user = #{bankUser},</if>
+            <if test="bankCity != null and bankCity != ''">bank_city = #{bankCity},</if>
+            <if test="bankCard != null and bankCard != ''">bank_card = #{bankCard},</if>
+            <if test="drawMoney != null">draw_money = #{drawMoney},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBizCashInfoById" parameterType="Long">
+        delete from biz_cash_info where id = #{id}
+    </delete>
+
+    <delete id="deleteBizCashInfoByIds" parameterType="String">
+        delete from biz_cash_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-business/src/main/resources/templates/business/cash/cash.html

@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('兑现申请记录列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>会员姓名：</label>
+                                <input type="text" name="memberName" placeholder="会员姓名或手机号"/>
+                            </li>
+                            <li>
+                                <label>开户银行：</label>
+                                <select name="bankId">
+                                    <option value="">所有</option>
+                                    <option class="bankOption" th:each="dict:${@dict.getType('busi_cashdraw_bank')}" th:value="*{dict.dictValue}" th:text="*{dict.dictLabel}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+            <!--
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="business:cash:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="business:cash:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="business:cash:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="business:cash:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>-->
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <style>
+        .fixed-table-toolbar{height: 0;overflow: hidden}
+    </style>
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('business:cash:edit')}]];
+        var prefix = ctx + "business/cash";
+
+        //取银行数据
+        var bankDict = {};
+        $(".bankOption").each(function(){bankDict[$(this).val()] = $(this).text()});
+        var accountTypes = ["福豆余额", "个人福豆", "团队福豆", "专项福豆", "福豆田"];
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                exportUrl: prefix + "/export",
+                modalName: "兑现申请记录",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: '兑现申请ID',
+                    visible: false
+                },
+                {
+                    field: 'memberName',
+                    title: '申请会员'
+                },
+                {
+                    field: 'accountType',
+                    title: '提现类型',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return accountTypes[value];
+                    }
+                },
+                {
+                    field: 'drawMoney',
+                    title: '提现金额',
+                    align: 'center'
+                },
+                {
+                    field: 'bankId',
+                    title: '开户银行',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return bankDict[value];
+                    }
+                },
+                {
+                    field: 'bankUser',
+                    title: '开户人姓名'
+                },
+                {
+                    field: 'bankCity',
+                    title: '开户地'
+                },
+                {
+                    field: 'bankCard',
+                    title: '卡号'
+                },
+                {
+                    field: 'status',
+                    title: '申请状态',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        switch (value){
+                            case 0: return "<span style='color:#5c5c5c'>待处理</span>";
+                            case 1: return "<span style='color:#db8301'>已处理</span>";
+                            case 2: return "<span style='color:#ad3636'>已驳回</span>";
+                        }
+                    }
+                },
+                {
+                    field: 'createTime',
+                    title: '申请时间',
+                    align: 'center'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        if(row.status == 0){
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="agreeRequest(\'' + row.id + '\')"><i class="fa fa-sign-out"></i>通过申请</a> ');
+                        }
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+
+        function agreeRequest(id){
+            $.modal.confirm("此操作设置该提现申请为已处理完毕, 是否继续?", function() {
+                $.operate.post(prefix + "/agree", {
+                    cashInfoID:id
+                }, function(response){
+                    if(response.code == 0){
+                        $.modal.alertSuccess('操作成功！')
+                    }
+                });
+            });
+        }
+    </script>
+</body>
+</html>

ruoyi-business/src/main/resources/templates/business/member/accountDetail.html

@@ -11,7 +11,7 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <label style="font-size:20px;width:500px;text-align: left">
+                            <label style="font-size:20px;width:600px;text-align: left">
                                 <a class="btn btn-success " onclick="history.back()">
                                     <i class="fa fa-reply"></i> 返回
                                 </a>

ruoyi-business/src/main/resources/templates/business/product/add.html

@@ -34,7 +34,7 @@
                         <label class="col-sm-3 control-label is-required">产品类型：</label>
                         <div class="col-sm-8">
                             <select name="productClass" class="form-control m-b" required>
-                                <option th:each="dict:${@dict.getType('busi_product_class')}" th:value="*{dict.dictCode}" th:text="*{dict.dictLabel}"></option>
+                                <option th:each="dict:${@dict.getType('busi_product_class')}" th:value="*{dict.dictValue}" th:text="*{dict.dictLabel}"></option>
                             </select>
                         </div>
                     </div>

ruoyi-business/src/main/resources/templates/business/product/edit.html

@@ -37,7 +37,7 @@
                         <label class="col-sm-3 control-label is-required">产品类型：</label>
                         <div class="col-sm-8">
                             <select th:field="*{bizProduct.productClass}" name="productClass" class="form-control m-b" required>
-                                <option th:each="dict:${@dict.getType('busi_product_class')}" th:value="*{dict.dictCode}" th:text="*{dict.dictLabel}"></option>
+                                <option th:each="dict:${@dict.getType('busi_product_class')}" th:value="*{dict.dictValue}" th:text="*{dict.dictLabel}"></option>
                             </select>
                         </div>
                     </div>

ruoyi-business/src/main/resources/templates/business/product/product.html

@@ -18,12 +18,12 @@
                                 <label>产品类型：</label>
                                 <select name="productClass">
                                     <option value="">所有</option>
-                                    <option class="classOption" th:each="dict:${@dict.getType('busi_product_class')}" th:value="*{dict.dictCode}" th:text="*{dict.dictLabel}"></option>
+                                    <option class="classOption" th:each="dict:${@dict.getType('busi_product_class')}" th:value="*{dict.dictValue}" th:text="*{dict.dictLabel}"></option>
                                 </select>
                             </li>
                             <li>
                                 <label>产品分类：</label>
-                                <select name="id">
+                                <select name="productTypeId">
                                     <option value="">所有</option>
                                     <option class="typeOption" th:each="ptype:${productTypeList}" th:value="*{ptype.id}" th:text="*{ptype.productTypeName}"></option>
                                 </select>

ruoyi-business/src/main/resources/templates/business/reward/reward.html

@@ -69,7 +69,7 @@
                 },
                 {
                     field: 'rewardDate',
-                    title: '奖励日期',
+                    title: '结算日期',
                     align: 'center'
                 },
                 {

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -77,7 +77,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
     public static final String getMilliTime()
     {
-        return dateTimeNow(YYYY_MM_DD_HH_MM_SS_SSS);
+        return dateTimeNow(YYYY_MM_DD_HH_MM_SS_SSS) + getRandomNumber(6);
+    }
+
+    //随机N位数字
+    public static final String getRandomNumber(int size)
+    {
+        String rand = String.valueOf(Math.random());
+        return rand.substring(2, 2 + size);
     }
 
     public static final String dateTimeNow()

sql/biz.sql

@@ -92,6 +92,13 @@ CREATE TABLE `biz_cash_info` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '兑现申请ID',
   `member_id` bigint(20) NOT NULL COMMENT '会员ID',
   `account_id` bigint(20) NOT NULL COMMENT '会员账户ID',
+  `account_type` tinyint(1) NOT NULL COMMENT '会员账户类型',
+  `bank_id` tinyint(1) DEFAULT 0 NOT NULL COMMENT '银行ID',
+  `bank_user` varchar(20) DEFAULT '' NOT NULL COMMENT '银行开户人',
+  `bank_city` varchar(64) DEFAULT '' NOT NULL COMMENT '银行开户地点',
+  `bank_card` varchar(30) DEFAULT '' NOT NULL COMMENT '银行卡号',
+  `draw_money` bigint(8) NOT NULL COMMENT '提现金额',
+  `status` tinyint(1) DEFAULT 0 NOT NULL COMMENT '提现状态',
   `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) DEFAULT '' COMMENT '更新者',

sql/menu/cashMenu.sql

@@ -0,0 +1,22 @@
+-- 菜单 SQL
+insert into sys_menu (menu_name, target, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('提现管理', 'menuItem', '0', '7', '/business/cash', 'C', '0', 'business:cash:view', 'fa fa-child', 'admin', '2018-03-01', 'ry', '2018-03-01', '提现菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('兑现申请记录查询', @parentId, '1',  '#',  'F', '0', 'business:cash:list',         '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('兑现申请记录新增', @parentId, '2',  '#',  'F', '0', 'business:cash:add',          '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('兑现申请记录修改', @parentId, '3',  '#',  'F', '0', 'business:cash:edit',         '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('兑现申请记录删除', @parentId, '4',  '#',  'F', '0', 'business:cash:remove',       '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('兑现申请记录导出', @parentId, '5',  '#',  'F', '0', 'business:cash:export',       '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');