Ver Fonte

提现修改

suochencheng há 6 anos atrás
pai
commit
d803d67a8e

+ 2 - 0
src/main/java/com/izouma/awesomeadmin/dao/MemberCoinTixianMapper.java

@@ -29,5 +29,7 @@ public interface MemberCoinTixianMapper{
     MemberCoinTixian queryMemberCoinTixian(MemberCoinTixian record);
 
     List<MemberCoinTixian> query(MemberCoinTixian record);
+
+    int tixianNum(MemberCoinTixian record);
 }
 

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
src/main/java/com/izouma/awesomeadmin/dao/MemberCoinTixianMapper.xml


+ 35 - 0
src/main/java/com/izouma/awesomeadmin/dao/TixianConfigMapper.java

@@ -0,0 +1,35 @@
+package com.izouma.awesomeadmin.dao;
+
+import java.util.*;
+import com.izouma.awesomeadmin.datasource.DataSource;
+import org.springframework.stereotype.Repository;
+import com.izouma.awesomeadmin.model.TixianConfig;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.TixianConfigMapper")
+public interface TixianConfigMapper{
+    /*generatedStart*/
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(TixianConfig record);
+
+    TixianConfig selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TixianConfig record);
+
+    List<TixianConfig> queryAllTixianConfig(TixianConfig record);
+
+    List<TixianConfig> queryTixianConfigByPage(Map<String, Object> parameter);
+
+    int delete(TixianConfig record);
+
+    TixianConfig queryTixianConfig(TixianConfig record);
+
+    List<TixianConfig> query(TixianConfig record);
+    /*generatedEnd*/
+
+}
+

+ 398 - 0
src/main/java/com/izouma/awesomeadmin/dao/TixianConfigMapper.xml

@@ -0,0 +1,398 @@
+<?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.izouma.awesomeadmin.dao.TixianConfigMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.TixianConfig">
+        <!--generatedStart-->
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
+        <result column="min_money" property="minMoney" jdbcType="INTEGER"/>
+        <result column="max_money" property="maxMoney" jdbcType="INTEGER"/>
+        <result column="day_times" property="dayTimes" jdbcType="INTEGER"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <!--generatedEnd-->
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        <!--generatedStart-->
+        id, del_flag, update_time, update_user, create_time, create_user, min_money, max_money, day_times, remark        <!--generatedEnd-->
+    </sql>
+
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM tixian_config
+        WHERE id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        DELETE
+        FROM tixian_config
+        WHERE id = #{id,jdbcType=INTEGER}
+    </delete>
+
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.TixianConfig" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO tixian_config
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <!--generatedStart-->
+            <if test="id!= null">
+                id,
+            </if>
+            <if test="delFlag!= null">
+                del_flag,
+            </if>
+            <if test="updateTime!= null">
+                update_time,
+            </if>
+            <if test="updateUser!= null">
+                update_user,
+            </if>
+            <if test="createTime!= null">
+                create_time,
+            </if>
+            <if test="createUser!= null">
+                create_user,
+            </if>
+            <if test="minMoney!= null">
+                min_money,
+            </if>
+            <if test="maxMoney!= null">
+                max_money,
+            </if>
+            <if test="dayTimes!= null">
+                day_times,
+            </if>
+            <if test="remark!= null">
+                remark,
+            </if>
+            <!--generatedEnd-->
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <!--generatedStart-->
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null">
+                #{delFlag,jdbcType=CHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null">
+                #{updateUser,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="createUser != null">
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="minMoney != null">
+                #{minMoney,jdbcType=INTEGER},
+            </if>
+            <if test="maxMoney != null">
+                #{maxMoney,jdbcType=INTEGER},
+            </if>
+            <if test="dayTimes != null">
+                #{dayTimes,jdbcType=INTEGER},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <!--generatedEnd-->
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.TixianConfig">
+        UPDATE tixian_config
+        <set>
+            <!--generatedStart-->
+            <if test="id != null">
+                id= #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null">
+                del_flag= #{delFlag,jdbcType=CHAR},
+            </if>
+            <if test="updateTime != null">
+                update_time= #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null">
+                update_user= #{updateUser,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time= #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="createUser != null">
+                create_user= #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="minMoney != null">
+                min_money= #{minMoney,jdbcType=INTEGER},
+            </if>
+            <if test="maxMoney != null">
+                max_money= #{maxMoney,jdbcType=INTEGER},
+            </if>
+            <if test="dayTimes != null">
+                day_times= #{dayTimes,jdbcType=INTEGER},
+            </if>
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
+            </if>
+            <!--generatedEnd-->
+        </set>
+        WHERE
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id IN (${idStr})
+        </if>
+    </update>
+
+    <select id="queryTixianConfigByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TixianConfig">
+        SELECT <include refid="Base_Column_List"/> FROM tixian_config
+        <where>
+            AND del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                AND id IN (${record.idStr})
+            </if>
+            <!--generatedStart-->
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                AND id = #{record.id}
+            </if>
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                AND del_flag = #{record.delFlag}
+            </if>
+            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                AND update_time = #{record.updateTime}
+            </if>
+            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                AND update_user = #{record.updateUser}
+            </if>
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                AND create_time = #{record.createTime}
+            </if>
+            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                AND create_user = #{record.createUser}
+            </if>
+            <if test="record.minMoney != null and !&quot;&quot;.equals(record.minMoney)">
+                AND min_money = #{record.minMoney}
+            </if>
+            <if test="record.maxMoney != null and !&quot;&quot;.equals(record.maxMoney)">
+                AND max_money = #{record.maxMoney}
+            </if>
+            <if test="record.dayTimes != null and !&quot;&quot;.equals(record.dayTimes)">
+                AND day_times = #{record.dayTimes}
+            </if>
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                AND remark = #{record.remark}
+            </if>
+            <!--generatedEnd-->
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    <!--generatedStart-->
+                    OR min_money LIKE concat('%',#{record.searchKey},'%')
+                    OR max_money LIKE concat('%',#{record.searchKey},'%')
+                    OR day_times LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                    <!--generatedEnd-->
+                </trim>
+            </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </otherwise>
+                    </choose>
+                </foreach>
+            </if>
+        </where>
+        ORDER BY
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id DESC
+    </select>
+
+    <select id="queryAllTixianConfig" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TixianConfig">
+        SELECT <include refid="Base_Column_List"/> FROM tixian_config
+        <where>
+            AND del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                AND id IN (${idStr})
+            </if>
+            <!--generatedStart-->
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                AND id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                AND del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                AND update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                AND update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                AND create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                AND create_user = #{createUser}
+            </if>
+            <if test="minMoney != null and !&quot;&quot;.equals(minMoney)">
+                AND min_money = #{minMoney}
+            </if>
+            <if test="maxMoney != null and !&quot;&quot;.equals(maxMoney)">
+                AND max_money = #{maxMoney}
+            </if>
+            <if test="dayTimes != null and !&quot;&quot;.equals(dayTimes)">
+                AND day_times = #{dayTimes}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                AND remark = #{remark}
+            </if>
+            <!--generatedEnd-->
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    <!--generatedStart-->
+                    OR min_money LIKE concat('%',#{searchKey},'%')
+                    OR max_money LIKE concat('%',#{searchKey},'%')
+                    OR day_times LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                    <!--generatedEnd-->
+                </trim>
+            </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </otherwise>
+                    </choose>
+                </foreach>
+            </if>
+        </where>
+        ORDER BY
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id DESC
+    </select>
+
+    <select id="queryTixianConfig" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TixianConfig">
+        SELECT <include refid="Base_Column_List"/> FROM tixian_config
+        <where>
+            AND del_flag = 'N'
+            <!--generatedStart-->
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                AND id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                AND del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                AND update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                AND update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                AND create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                AND create_user = #{createUser}
+            </if>
+            <if test="minMoney != null and !&quot;&quot;.equals(minMoney)">
+                AND min_money = #{minMoney}
+            </if>
+            <if test="maxMoney != null and !&quot;&quot;.equals(maxMoney)">
+                AND max_money = #{maxMoney}
+            </if>
+            <if test="dayTimes != null and !&quot;&quot;.equals(dayTimes)">
+                AND day_times = #{dayTimes}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                AND remark = #{remark}
+            </if>
+            <!--generatedEnd-->
+        </where>
+        LIMIT 1
+    </select>
+
+    <update id="delete">
+        UPDATE tixian_config SET del_flag = 'Y'
+        WHERE
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id IN (${idStr})
+        </if>
+    </update>
+
+    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TixianConfig">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM tixian_config
+        <where>
+            AND del_flag = 'N'
+            <!--generatedStart-->
+            <!--generatedEnd-->
+        </where>
+        ORDER BY id DESC
+    </select>
+</mapper>
+

+ 144 - 0
src/main/java/com/izouma/awesomeadmin/model/TixianConfig.java

@@ -0,0 +1,144 @@
+package com.izouma.awesomeadmin.model;
+
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class TixianConfig{
+    /*generatedStart*/
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private Integer minMoney;
+    private Integer maxMoney;
+    private Integer dayTimes;
+    private String remark;
+
+    private String idStr;
+
+    private String searchKey;
+
+    /**
+    * and,test_name,like,value;or,remark,=,123
+    */
+    private String advancedQuery;
+
+    /**
+    * column_name_,desc_;column_name_,asc
+    */
+    private String orderByStr;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public Integer getMinMoney(){
+        return this.minMoney;
+    }
+
+    public void setMinMoney(Integer minMoney){
+        this.minMoney = minMoney;
+    }
+    public Integer getMaxMoney(){
+        return this.maxMoney;
+    }
+
+    public void setMaxMoney(Integer maxMoney){
+        this.maxMoney = maxMoney;
+    }
+    public Integer getDayTimes(){
+        return this.dayTimes;
+    }
+
+    public void setDayTimes(Integer dayTimes){
+        this.dayTimes = dayTimes;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+
+    public String getSearchKey() {
+        return searchKey;
+    }
+
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
+
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
+
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
+
+    public String getOrderByStr() {
+        return orderByStr;
+    }
+
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
+
+    public String getIdStr() {
+        return idStr;
+    }
+
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
+    /*generatedEnd*/
+
+}
+

+ 5 - 4
src/main/java/com/izouma/awesomeadmin/service/MemberCoinService.java

@@ -1,14 +1,15 @@
 package com.izouma.awesomeadmin.service;
 
-import java.util.*;
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.model.MemberCoin;
 
+import java.util.List;
+
 
 /**
-*  service接口类
-*/
-public interface MemberCoinService{
+ * service接口类
+ */
+public interface MemberCoinService {
 
     List<MemberCoin> getMemberCoinList(MemberCoin record);
 

+ 6 - 3
src/main/java/com/izouma/awesomeadmin/service/MemberCoinTixianService.java

@@ -1,14 +1,15 @@
 package com.izouma.awesomeadmin.service;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.model.MemberCoinTixian;
 
 
 /**
-*  service接口类
-*/
-public interface MemberCoinTixianService{
+ * service接口类
+ */
+public interface MemberCoinTixianService {
 
     List<MemberCoinTixian> getMemberCoinTixianList(MemberCoinTixian record);
 
@@ -23,5 +24,7 @@ public interface MemberCoinTixianService{
     boolean deleteMemberCoinTixian(MemberCoinTixian record);
 
     boolean updateMemberCoinTixian(MemberCoinTixian record);
+
+    int tixianNum(MemberCoinTixian record);
 }
 

+ 28 - 0
src/main/java/com/izouma/awesomeadmin/service/TixianConfigService.java

@@ -0,0 +1,28 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.TixianConfig;
+
+
+/**
+*  service接口类
+*/
+public interface TixianConfigService{
+    /*generatedStart*/
+    List<TixianConfig> getTixianConfigList(TixianConfig record);
+
+    List<TixianConfig> getTixianConfigByPage(Page page, TixianConfig record);
+
+    TixianConfig getTixianConfigById(String id);
+
+    TixianConfig getTixianConfig(TixianConfig record);
+
+    boolean createTixianConfig(TixianConfig record);
+
+    boolean deleteTixianConfig(TixianConfig record);
+
+    boolean updateTixianConfig(TixianConfig record);
+    /*generatedEnd*/
+}
+

+ 11 - 8
src/main/java/com/izouma/awesomeadmin/service/impl/MemberCoinServiceImpl.java

@@ -1,21 +1,23 @@
 package com.izouma.awesomeadmin.service.impl;
 
-import java.math.BigDecimal;
-import java.util.*;
-
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dao.MemberCoinMapper;
 import com.izouma.awesomeadmin.dao.RechargeRecordMapper;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.MemberCoin;
 import com.izouma.awesomeadmin.model.RechargeRecord;
 import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.service.MemberCoinService;
 import com.izouma.awesomeadmin.service.UserInfoService;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.izouma.awesomeadmin.constant.AppConstant;
-import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.MemberCoin;
-import com.izouma.awesomeadmin.service.MemberCoinService;
-import com.izouma.awesomeadmin.dao.MemberCoinMapper;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * service接口实现类
@@ -306,5 +308,6 @@ public class MemberCoinServiceImpl implements MemberCoinService {
 
         return 0;
     }
+
 }
 

+ 36 - 18
src/main/java/com/izouma/awesomeadmin/service/impl/MemberCoinTixianServiceImpl.java

@@ -1,6 +1,7 @@
 package com.izouma.awesomeadmin.service.impl;
 
 import java.util.*;
+
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,10 +12,10 @@ import com.izouma.awesomeadmin.service.MemberCoinTixianService;
 import com.izouma.awesomeadmin.dao.MemberCoinTixianMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class MemberCoinTixianServiceImpl implements MemberCoinTixianService{
+public class MemberCoinTixianServiceImpl implements MemberCoinTixianService {
 
     private static Logger logger = Logger.getLogger(MemberCoinTixianServiceImpl.class);
 
@@ -27,26 +28,27 @@ public class MemberCoinTixianServiceImpl implements MemberCoinTixianService{
         logger.info("getMemberCoinTixianList");
         try {
 
-        return memberCoinTixianMapper.queryAllMemberCoinTixian(record);
+            return memberCoinTixianMapper.queryAllMemberCoinTixian(record);
         } catch (Exception e) {
-        logger.error("getMemberCoinTixianList", e);
+            logger.error("getMemberCoinTixianList", e);
         }
 
         return null;
     }
+
     @Override
     public List<MemberCoinTixian> getMemberCoinTixianByPage(Page page, MemberCoinTixian record) {
 
         logger.info("getMemberCoinTixianByPage");
         try {
 
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return memberCoinTixianMapper.queryMemberCoinTixianByPage(parameter);
+            return memberCoinTixianMapper.queryMemberCoinTixianByPage(parameter);
         } catch (Exception e) {
-        logger.error("getMemberCoinTixianByPage", e);
+            logger.error("getMemberCoinTixianByPage", e);
         }
 
         return null;
@@ -60,7 +62,7 @@ public class MemberCoinTixianServiceImpl implements MemberCoinTixianService{
 
             return memberCoinTixianMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getMemberCoinTixianById", e);
+            logger.error("getMemberCoinTixianById", e);
         }
 
         return null;
@@ -74,7 +76,7 @@ public class MemberCoinTixianServiceImpl implements MemberCoinTixianService{
 
             return memberCoinTixianMapper.queryMemberCoinTixian(record);
         } catch (Exception e) {
-        logger.error("getMemberCoinTixian", e);
+            logger.error("getMemberCoinTixian", e);
         }
 
         return null;
@@ -89,7 +91,7 @@ public class MemberCoinTixianServiceImpl implements MemberCoinTixianService{
             int updates = memberCoinTixianMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createMemberCoinTixian", e);
@@ -104,13 +106,13 @@ public class MemberCoinTixianServiceImpl implements MemberCoinTixianService{
         logger.info("deleteMemberCoinTixian");
         try {
 
-             int updates = memberCoinTixianMapper.delete(record);
+            int updates = memberCoinTixianMapper.delete(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteMemberCoinTixian", e);
+            logger.error("deleteMemberCoinTixian", e);
         }
 
         return false;
@@ -125,13 +127,29 @@ public class MemberCoinTixianServiceImpl implements MemberCoinTixianService{
             int updates = memberCoinTixianMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateMemberCoinTixian", e);
+            logger.error("updateMemberCoinTixian", e);
         }
 
         return false;
     }
+
+    @Override
+    public int tixianNum(MemberCoinTixian record) {
+
+        logger.info("tixianNum");
+        try {
+
+            return memberCoinTixianMapper.tixianNum(record);
+
+        } catch (Exception e) {
+            logger.error("tixianNum", e);
+        }
+
+        return 0;
+    }
+
 }
 

+ 117 - 0
src/main/java/com/izouma/awesomeadmin/service/impl/TixianConfigServiceImpl.java

@@ -0,0 +1,117 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.TixianConfig;
+import com.izouma.awesomeadmin.service.TixianConfigService;
+import com.izouma.awesomeadmin.dao.TixianConfigMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class TixianConfigServiceImpl implements TixianConfigService{
+    /*generatedStart*/
+    private static Logger logger = Logger.getLogger(TixianConfigServiceImpl.class);
+
+    @Autowired
+    private TixianConfigMapper tixianConfigMapper;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    @Override
+    public List<TixianConfig> getTixianConfigList(TixianConfig record) {
+        logger.info("getTixianConfigList");
+        try {
+            return tixianConfigMapper.queryAllTixianConfig(record);
+        } catch (Exception e) {
+            logger.error("getTixianConfigList", e);
+        }
+        return null;
+    }
+
+    @Override
+    public List<TixianConfig> getTixianConfigByPage(Page page, TixianConfig record) {
+        logger.info("getTixianConfigByPage");
+        try {
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
+
+            return tixianConfigMapper.queryTixianConfigByPage(parameter);
+        } catch (Exception e) {
+            logger.error("getTixianConfigByPage", e);
+        }
+        return null;
+    }
+
+    @Override
+    public TixianConfig getTixianConfigById(String id) {
+        logger.info("getTixianConfigyId");
+        try {
+            return tixianConfigMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+            logger.error("getTixianConfigById", e);
+        }
+        return null;
+    }
+
+    @Override
+    public TixianConfig getTixianConfig(TixianConfig record) {
+        logger.info("getTixianConfig");
+        try {
+            return tixianConfigMapper.queryTixianConfig(record);
+        } catch (Exception e) {
+            logger.error("getTixianConfig", e);
+        }
+        return null;
+    }
+
+    @Override
+    public boolean createTixianConfig(TixianConfig record) {
+        logger.info("createTixianConfig");
+        try {
+            int updates = tixianConfigMapper.insertSelective(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createTixianConfig", e);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean deleteTixianConfig(TixianConfig record) {
+        logger.info("deleteTixianConfig");
+        try {
+            int updates = tixianConfigMapper.delete(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteTixianConfig", e);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean updateTixianConfig(TixianConfig record) {
+        logger.info("updateTixianConfig");
+        try {
+            int updates = tixianConfigMapper.updateByPrimaryKeySelective(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateTixianConfig", e);
+        }
+        return false;
+    }
+    /*generatedEnd*/
+}
+

+ 217 - 62
src/main/java/com/izouma/awesomeadmin/web/MemberCoinTixianController.java

@@ -1,7 +1,15 @@
 package com.izouma.awesomeadmin.web;
 
+import java.math.BigDecimal;
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.MemberCoin;
+import com.izouma.awesomeadmin.model.TixianConfig;
+import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.service.MemberCoinService;
+import com.izouma.awesomeadmin.service.TixianConfigService;
+import com.izouma.awesomeadmin.service.UserInfoService;
+import com.izouma.awesomeadmin.util.DateTimeTool;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -18,8 +26,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/memberCoinTixian")
 public class MemberCoinTixianController {
@@ -27,9 +35,17 @@ public class MemberCoinTixianController {
     @Autowired
     private MemberCoinTixianService memberCoinTixianService;
 
+    @Autowired
+    private UserInfoService userInfoService;
+
+    @Autowired
+    private MemberCoinService memberCoinService;
+    @Autowired
+    private TixianConfigService tixianConfigService;
+
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +55,8 @@ public class MemberCoinTixianController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getMemberCoinTixian", method = RequestMethod.GET)
     @ResponseBody
     public Result getMemberCoinTixian(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +65,8 @@ public class MemberCoinTixianController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(MemberCoinTixian record) {
@@ -60,14 +76,14 @@ public class MemberCoinTixianController {
 
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, MemberCoinTixian record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<MemberCoinTixian> pp =memberCoinTixianService.getMemberCoinTixianByPage(page, record);
+        List<MemberCoinTixian> pp = memberCoinTixianService.getMemberCoinTixianByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -76,97 +92,236 @@ public class MemberCoinTixianController {
 
 
     /**
-    * <p>保存。</p>
-    */
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ResponseBody
-    public Result save(MemberCoinTixian record) {
-        boolean num = memberCoinTixianService.createMemberCoinTixian(record);
-        if (num) {
-        return new Result(true, record.getId());
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateMemberCoinTixian(MemberCoinTixian record) {
         boolean num = memberCoinTixianService.updateMemberCoinTixian(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteMemberCoinTixian(MemberCoinTixian record) {
 
         boolean num = memberCoinTixianService.deleteMemberCoinTixian(record);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, MemberCoinTixian record) throws Exception {
 
-    List<MemberCoinTixian> memberCoinTixians = memberCoinTixianService.getMemberCoinTixianList(record);
+        List<MemberCoinTixian> memberCoinTixians = memberCoinTixianService.getMemberCoinTixianList(record);
 
 
         String sheetName = "member_coin_tixian";
         String titleName = "用户余额提现数据表";
         String fileName = "用户余额提现表";
         int columnNumber = 21;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户" ,   "提现金额" ,   "状态" ,   "手续费" ,   "实发金额" ,   "处理人" ,   "成交时间" ,   "微信" ,   "支付宝" ,   "银行卡号" ,   "开户行" ,   "开户名" ,   "提现方式" ,   "备注" ,   "提现CODE"  };
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"ID", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "用户", "提现金额", "状态", "手续费", "实发金额", "处理人", "成交时间", "微信", "支付宝", "银行卡号", "开户行", "开户名", "提现方式", "备注", "提现CODE"};
         String[][] dataList = new String[memberCoinTixians.size()][21];
 
         for (int i = 0; i < memberCoinTixians.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(memberCoinTixians.get(i).getId());
-                        dataList[i][1] = String.valueOf(memberCoinTixians.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(memberCoinTixians.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(memberCoinTixians.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(memberCoinTixians.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(memberCoinTixians.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(memberCoinTixians.get(i).getUserId());
-                        dataList[i][7] = String.valueOf(memberCoinTixians.get(i).getMoney());
-                        dataList[i][8] = String.valueOf(memberCoinTixians.get(i).getStatusFlag());
-                        dataList[i][9] = String.valueOf(memberCoinTixians.get(i).getFee());
-                        dataList[i][10] = String.valueOf(memberCoinTixians.get(i).getNetAmount());
-                        dataList[i][11] = String.valueOf(memberCoinTixians.get(i).getDealUser());
-                        dataList[i][12] = String.valueOf(memberCoinTixians.get(i).getDealTime());
-                        dataList[i][13] = String.valueOf(memberCoinTixians.get(i).getWechat());
-                        dataList[i][14] = String.valueOf(memberCoinTixians.get(i).getAlipay());
-                        dataList[i][15] = String.valueOf(memberCoinTixians.get(i).getBankCard());
-                        dataList[i][16] = String.valueOf(memberCoinTixians.get(i).getBankName());
-                        dataList[i][17] = String.valueOf(memberCoinTixians.get(i).getOpenName());
-                        dataList[i][18] = String.valueOf(memberCoinTixians.get(i).getTypeFlag());
-                        dataList[i][19] = String.valueOf(memberCoinTixians.get(i).getRemark());
-                        dataList[i][20] = String.valueOf(memberCoinTixians.get(i).getTixianCode());
-                    }
+            dataList[i][0] = String.valueOf(memberCoinTixians.get(i).getId());
+            dataList[i][1] = String.valueOf(memberCoinTixians.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(memberCoinTixians.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(memberCoinTixians.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(memberCoinTixians.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(memberCoinTixians.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(memberCoinTixians.get(i).getUserId());
+            dataList[i][7] = String.valueOf(memberCoinTixians.get(i).getMoney());
+            dataList[i][8] = String.valueOf(memberCoinTixians.get(i).getStatusFlag());
+            dataList[i][9] = String.valueOf(memberCoinTixians.get(i).getFee());
+            dataList[i][10] = String.valueOf(memberCoinTixians.get(i).getNetAmount());
+            dataList[i][11] = String.valueOf(memberCoinTixians.get(i).getDealUser());
+            dataList[i][12] = String.valueOf(memberCoinTixians.get(i).getDealTime());
+            dataList[i][13] = String.valueOf(memberCoinTixians.get(i).getWechat());
+            dataList[i][14] = String.valueOf(memberCoinTixians.get(i).getAlipay());
+            dataList[i][15] = String.valueOf(memberCoinTixians.get(i).getBankCard());
+            dataList[i][16] = String.valueOf(memberCoinTixians.get(i).getBankName());
+            dataList[i][17] = String.valueOf(memberCoinTixians.get(i).getOpenName());
+            dataList[i][18] = String.valueOf(memberCoinTixians.get(i).getTypeFlag());
+            dataList[i][19] = String.valueOf(memberCoinTixians.get(i).getRemark());
+            dataList[i][20] = String.valueOf(memberCoinTixians.get(i).getTixianCode());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
+
+
+    }
+
+
+    /**
+     * <p>保存。</p>
+     */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(MemberCoinTixian record) {
+
+        double coin = record.getMoney().doubleValue();
+        if (coin <= 0) {
+            return new Result(false, "不能提现负值");
+        }
+        int userIdInt = Integer.valueOf(record.getUserId());
+
+        TixianConfig tixianConfig = tixianConfigService.getTixianConfigById("1");
+
+        double minMoney = tixianConfig.getMinMoney().doubleValue();
+        double maxMoney = tixianConfig.getMaxMoney().doubleValue();
+        int dayTimes = tixianConfig.getDayTimes();
+        if (coin < minMoney) {
+            return new Result(false, "提现额度过低");
+        }
+        if (coin > maxMoney) {
+            return new Result(false, "提现额度过高");
+        }
+
+        int tixianTimes = memberCoinTixianService.tixianNum(record);
+
+        if (tixianTimes > dayTimes) {
+            return new Result(false, "今日提现次数已用完");
+        }
+
+
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId(userIdInt);
+
+        userInfo = userInfoService.getSingleUserInfo(userInfo);
+
+        if (userInfo == null) {
+            return new Result(false, "提现用户不存在");
+        }
+
+        double balance = userInfo.getMoneyCoin();
+
+        if (balance < coin) {
+            return new Result(false, "用户余额不足,不能提现");
+        }
+
+        double fee = 0;
+        double cash = coin - fee;
+        double moneyCoin = balance - coin;
 
+        MemberCoin memberCoin = new MemberCoin();
+        memberCoin.setUserId(record.getUserId());
+        memberCoin.setMoney(BigDecimal.valueOf(-cash));
+        memberCoin.setBalance(BigDecimal.valueOf(balance - cash));
+        memberCoin.setTypeFlag(AppConstant.CoinType.CASH);
+        memberCoin.setRemark("余额提现:" + cash);
+        memberCoinService.createMemberCoin(memberCoin);
 
+        if (fee > 0) {
+            MemberCoin memberCoinFee = new MemberCoin();
+            memberCoin.setUserId(record.getUserId());
+            memberCoinFee.setMoney(BigDecimal.valueOf(-fee));
+            memberCoinFee.setBalance(BigDecimal.valueOf(moneyCoin));
+            memberCoinFee.setTypeFlag(AppConstant.CoinType.TAXES);
+            memberCoinFee.setRemark("余额提现手续费:" + fee);
+            memberCoinService.createMemberCoin(memberCoinFee);
         }
+
+
+        UserInfo updateUser = new UserInfo();
+        updateUser.setId(userIdInt);
+        updateUser.setMoneyCoin(moneyCoin);
+        userInfoService.updateUserInfo(updateUser);
+
+        record.setFee(BigDecimal.valueOf(fee));
+        record.setNetAmount(BigDecimal.valueOf(cash));
+        boolean num = memberCoinTixianService.createMemberCoinTixian(record);
+        if (num) {
+            return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
     }
 
+    @RequestMapping(value = "/pass", method = RequestMethod.POST)
+    @ResponseBody
+    public Result pass(MemberCoinTixian memberCoinTixian) {
+
+        boolean num = memberCoinTixianService.updateMemberCoinTixian(memberCoinTixian);
+        if (num) {
+            return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+
+    }
+
+
+    @RequestMapping(value = "/fail", method = RequestMethod.POST)
+    @ResponseBody
+    public Result fail(MemberCoinTixian memberCoinTixian) {
+
+        MemberCoinTixian tiXian = memberCoinTixianService.getMemberCoinTixianById(memberCoinTixian.getId() + "");
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId(Integer.valueOf(tiXian.getUserId()));
+
+        userInfo = userInfoService.getSingleUserInfo(userInfo);
+
+        if (userInfo != null) {
+
+
+            double balance = userInfo.getMoneyCoin();
+
+            double cash = tiXian.getMoney().doubleValue();
+            double moneyCoin = balance + cash;
+
+            MemberCoin memberCoin = new MemberCoin();
+            memberCoin.setUserId(userInfo.getId());
+            memberCoin.setMoney(BigDecimal.valueOf(cash));
+            memberCoin.setBalance(BigDecimal.valueOf(balance + cash));
+            memberCoin.setTypeFlag(AppConstant.CoinType.FAN_HUAN);
+            memberCoin.setRemark("余额提现失败返还:" + cash);
+            memberCoinService.createMemberCoin(memberCoin);
+
+            UserInfo updateUser = new UserInfo();
+            updateUser.setId(userInfo.getId());
+            updateUser.setMoneyCoin(moneyCoin);
+            userInfoService.updateUserInfo(updateUser);
+
+            memberCoinTixian.setDealTime(new Date());
+
+            boolean num = memberCoinTixianService.updateMemberCoinTixian(memberCoinTixian);
+            if (num) {
+                return new Result(true, "保存成功");
+            }
+
+        }
+        return new Result(false, "保存异常");
+
+    }
+
+    @RequestMapping(value = "/tixianNum", method = RequestMethod.GET)
+    @ResponseBody
+    public Result tixianNum(MemberCoinTixian record) {
+
+        int num = memberCoinTixianService.tixianNum(record);
+
+        return new Result(true, num);
+    }
+
+}
+

+ 126 - 0
src/main/java/com/izouma/awesomeadmin/web/TixianConfigController.java

@@ -0,0 +1,126 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.TixianConfig;
+import com.izouma.awesomeadmin.service.TixianConfigService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+@RequestMapping("/tixianConfig")
+public class TixianConfigController {
+    /*generatedStart*/
+    @Autowired
+    private TixianConfigService tixianConfigService;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(TixianConfig record) {
+        List<TixianConfig> pp = tixianConfigService.getTixianConfigList(record);
+        return new Result(true, pp);
+    }
+
+    @RequestMapping(value = "/getTixianConfig", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getTixianConfig(@RequestParam(required = false, value = "id") String id) {
+        TixianConfig data = tixianConfigService.getTixianConfigById(id);
+        return new Result(true, data);
+    }
+
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(TixianConfig record) {
+        TixianConfig data = tixianConfigService.getTixianConfig(record);
+        return new Result(true, data);
+    }
+
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, TixianConfig record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<TixianConfig> pp =tixianConfigService.getTixianConfigByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(TixianConfig record) {
+        boolean num = tixianConfigService.createTixianConfig(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateTixianConfig(TixianConfig record) {
+        boolean num = tixianConfigService.updateTixianConfig(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteTixianConfig(TixianConfig record) {
+
+        boolean num = tixianConfigService.deleteTixianConfig(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, TixianConfig record) throws Exception {
+
+        List<TixianConfig> tixianConfigs = tixianConfigService.getTixianConfigList(record);
+
+        String sheetName = "tixian_config";
+        String titleName = "提现配置数据表";
+        String fileName = "提现配置表";
+        int columnNumber = 10;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "最小提现额" ,   "最大提现额" ,   "每日提现次数" ,   "备注"  };
+        String[][] dataList = new String[tixianConfigs.size()][10];
+
+        for (int i = 0; i < tixianConfigs.size(); i++) {
+                        dataList[i][0] = String.valueOf(tixianConfigs.get(i).getId());
+                        dataList[i][1] = String.valueOf(tixianConfigs.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(tixianConfigs.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(tixianConfigs.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(tixianConfigs.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(tixianConfigs.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(tixianConfigs.get(i).getMinMoney());
+                        dataList[i][7] = String.valueOf(tixianConfigs.get(i).getMaxMoney());
+                        dataList[i][8] = String.valueOf(tixianConfigs.get(i).getDayTimes());
+                        dataList[i][9] = String.valueOf(tixianConfigs.get(i).getRemark());
+                    }
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+                columnNumber, columnWidth, columnName, dataList, response);
+    }
+    /*generatedEnd*/
+}
+

+ 9 - 9
src/main/resources/spring/appWebService.xml

@@ -28,15 +28,15 @@
     <task:annotation-driven/> <!-- 定时器开关-->
 
     <!--自动开始房间定时任务-->
-    <bean id="houseInfoTask" class="com.izouma.awesomeadmin.web.HouseInfoController"></bean>
-
-    <task:scheduled-tasks>
-        <task:scheduled ref="houseInfoTask" method="autoBegin" cron="0 0/1 * * * ? "/>
-        <task:scheduled ref="houseInfoTask" method="autoNoStartPlay" cron="0 0/2 * * * ? "/>
-        <task:scheduled ref="houseInfoTask" method="autoEnd" cron="0 0/5 * * * ? "/>
-        <task:scheduled ref="houseInfoTask" method="updateToAnalysis" cron="0 0/2 * * * ? "/>
-        <task:scheduled ref="houseInfoTask" method="autoSettlement" cron="0 0/3 * * * ? "/>
-    </task:scheduled-tasks>
+<!--    <bean id="houseInfoTask" class="com.izouma.awesomeadmin.web.HouseInfoController"></bean>-->
+
+<!--    <task:scheduled-tasks>-->
+<!--        <task:scheduled ref="houseInfoTask" method="autoBegin" cron="0 0/1 * * * ? "/>-->
+<!--        <task:scheduled ref="houseInfoTask" method="autoNoStartPlay" cron="0 0/2 * * * ? "/>-->
+<!--        <task:scheduled ref="houseInfoTask" method="autoEnd" cron="0 0/5 * * * ? "/>-->
+<!--        <task:scheduled ref="houseInfoTask" method="updateToAnalysis" cron="0 0/2 * * * ? "/>-->
+<!--        <task:scheduled ref="houseInfoTask" method="autoSettlement" cron="0 0/3 * * * ? "/>-->
+<!--    </task:scheduled-tasks>-->
 
 
 </beans>

+ 9 - 12
src/main/vue/src/pages/MemberCoinTixian.vue

@@ -5,7 +5,7 @@
                                                                                                                                                                                                                                     <el-form-item prop="userId" label="用户">
                 <el-input v-model="formData.userId" :disabled="'userId'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="money" label="提现金额">
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="money" label="金额">
                 <el-input v-model="formData.money" :disabled="'money'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="statusFlag" label="状态">
@@ -17,10 +17,10 @@
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="netAmount" label="实发金额">
                 <el-input v-model="formData.netAmount" :disabled="'netAmount'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="dealUser" label="处理人">
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="dealUser" label="放款人">
                 <el-input v-model="formData.dealUser" :disabled="'dealUser'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="dealTime" label="成交时间">
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="dealTime" label="放款时间">
                 <el-input v-model="formData.dealTime" :disabled="'dealTime'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="wechat" label="微信">
@@ -35,17 +35,14 @@
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="bankName" label="开户行">
                 <el-input v-model="formData.bankName" :disabled="'bankName'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="openName" label="开户">
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="openName" label="开户">
                 <el-input v-model="formData.openName" :disabled="'openName'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="typeFlag" label="提现方式">
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="typeFlag" label="类型">
                 <el-input v-model="formData.typeFlag" :disabled="'typeFlag'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="remark" label="备注">
                 <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="tixianCode" label="提现CODE">
-                <el-input v-model="formData.tixianCode" :disabled="'tixianCode'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                         <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -74,7 +71,7 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
                         this.formData = res.data;
 
                     if (this.$route.query.column) {
@@ -88,14 +85,14 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
-                                                                                                                                                                                    subColumn: '',
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
+                                                                                                                                                                            subColumn: '',
             subValue: '',
         }
         },

+ 507 - 488
src/main/vue/src/pages/MemberCoinTixians.vue

@@ -1,25 +1,25 @@
 <template>
     <div>
         <div class="filters-container">
-        
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-select v-model="statusFlag" clearable filterable placeholder="状态" @change="searchData" size="small" style="width:120px">
+                <el-option v-for="item in statusFlagOptions" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+            </el-select>
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item" style="width:120px"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
             </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/memberCoinTixian',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <el-button @click="$router.push({path:'/memberCoinTixian',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -27,143 +27,67 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
             </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
+            <el-table-column type="index" min-width="50" align="center">
             </el-table-column>
-                            
-                                            <el-table-column
-                                v-if="isColumnShow('id')"
-                                prop="id"
-                                label="ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                                                                                                                                                            
-                                            <el-table-column
-                                v-if="isColumnShow('userId')"
-                                prop="userId"
-                                label="用户"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('money')"
-                                prop="money"
-                                label="提现金额"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('statusFlag')"
-                                prop="statusFlag"
-                                label="状态"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('fee')"
-                                prop="fee"
-                                label="手续费"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('netAmount')"
-                                prop="netAmount"
-                                label="实发金额"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('dealUser')"
-                                prop="dealUser"
-                                label="处理人"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('dealTime')"
-                                prop="dealTime"
-                                label="成交时间"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('wechat')"
-                                prop="wechat"
-                                label="微信"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('alipay')"
-                                prop="alipay"
-                                label="支付宝"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('bankCard')"
-                                prop="bankCard"
-                                label="银行卡号"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('bankName')"
-                                prop="bankName"
-                                label="开户行"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('openName')"
-                                prop="openName"
-                                label="开户名"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('typeFlag')"
-                                prop="typeFlag"
-                                label="提现方式"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark')"
-                                prop="remark"
-                                label="备注"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('tixianCode')"
-                                prop="tixianCode"
-                                label="提现CODE"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
+
+            <el-table-column v-if="isColumnShow('userId')" prop="userId" label="用户" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('userId')" prop="userInfo.nickname" label="用户名" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('userId')" prop="userInfo.phone" label="用户电话" min-width="120">
+            </el-table-column>
+
+            <el-table-column prop="tixianCode" label="提现CODE" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('money')" prop="money" label="金额" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('statusFlag')" prop="statusFlag" :formatter="StatusFlagFormatter" label="状态" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('fee')" prop="fee" label="手续费" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('netAmount')" prop="netAmount" label="实发金额" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('dealUser')" prop="dealUser" label="放款人" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('dealTime')" prop="dealTime" label="放款时间" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('wechat')" prop="wechat" label="微信" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('alipay')" prop="alipay" label="支付宝" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('bankCard')" prop="bankCard" label="银行卡号" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('bankName')" prop="bankName" label="开户行" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('openName')" prop="openName" label="开户人" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('typeFlag')" prop="typeFlag" :formatter="TypeFlagFormatter" label="类型" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="scope">
-                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                    <!-- <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button> -->
+                    <!-- <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button> -->
+                    <el-button @click="approverRow(scope.row)" v-if="scope.row.statusFlag==0" type="primary" size="mini" plain>审核</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -176,15 +100,7 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -205,16 +121,14 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
                 <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
                     <template slot-scope="{row}">
                         <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item"
-                                       :key="item"></el-option>
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -244,8 +158,7 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -276,372 +189,478 @@
             <img width="100%" :src="imgSrc" alt="">
         </el-dialog>
 
+        <el-dialog title="审核" :visible.sync="showDialog">
+            原因:
+            <el-input v-model="testimonials.content"></el-input>
+            操作人:
+            <el-input v-model="testimonials.dealUser"></el-input>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="showDialog = false">取 消</el-button>
+                <el-button type="primary" @click="passTestimonials">通 过</el-button>
+                <el-button type="danger" @click="failTestimonials">失败</el-button>
+            </span>
+        </el-dialog>
+
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: '用户',
+                    value: 'userId',
+                    show: true
+                },
+                {
+                    label: '金额',
+                    value: 'money',
+                    show: true
+                },
+                {
+                    label: '状态',
+                    value: 'statusFlag',
+                    show: true
+                },
+                {
+                    label: '手续费',
+                    value: 'fee',
+                    show: true
+                },
+                {
+                    label: '实发金额',
+                    value: 'netAmount',
+                    show: true
+                },
+                {
+                    label: '放款人',
+                    value: 'dealUser',
+                    show: true
+                },
+                {
+                    label: '放款时间',
+                    value: 'dealTime',
+                    show: true
+                },
+                {
+                    label: '微信',
+                    value: 'wechat',
+                    show: true
+                },
+                {
+                    label: '支付宝',
+                    value: 'alipay',
+                    show: true
+                },
+                {
+                    label: '银行卡号',
+                    value: 'bankCard',
+                    show: true
+                },
+                {
+                    label: '开户行',
+                    value: 'bankName',
+                    show: true
+                },
+                {
+                    label: '开户人',
+                    value: 'openName',
+                    show: true
+                },
+                {
+                    label: '类型',
+                    value: 'typeFlag',
+                    show: true
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: '用户',
+                    value: 'user_id'
+                },
+                {
+                    label: '金额',
+                    value: 'money'
+                },
+                {
+                    label: '状态',
+                    value: 'status_flag'
+                },
+                {
+                    label: '手续费',
+                    value: 'fee'
+                },
+                {
+                    label: '实发金额',
+                    value: 'net_amount'
+                },
+                {
+                    label: '放款人',
+                    value: 'deal_user'
+                },
+                {
+                    label: '放款时间',
+                    value: 'deal_time'
+                },
+                {
+                    label: '微信',
+                    value: 'wechat'
+                },
+                {
+                    label: '支付宝',
+                    value: 'alipay'
+                },
+                {
+                    label: '银行卡号',
+                    value: 'bank_card'
+                },
+                {
+                    label: '开户行',
+                    value: 'bank_name'
+                },
+                {
+                    label: '开户人',
+                    value: 'open_name'
+                },
+                {
+                    label: '类型',
+                    value: 'type_flag'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+            showDialog: false,
+            testimonials: {
+                content: '',
+                dealUser: ''
 
-    export default {
-        created() {
+            },
+            auditorId: '',
+             statusFlagOptions: [
+                { label: '审核中', value: '0' },
+                { label: '通过', value: '1' },
+                { label: '失败', value: '2' }
+            ],
+            statusFlag: '0'
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
+            this.getData();
+        },
+        currentPageChange(page) {
+            this.currentPage = page;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id',
-                                show: true
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '用户',
-                                value: 'userId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '提现金额',
-                                value: 'money',
-                                show: true
-                            },
-                                                                                                {
-                                label: '状态',
-                                value: 'statusFlag',
-                                show: true
-                            },
-                                                                                                {
-                                label: '手续费',
-                                value: 'fee',
-                                show: true
-                            },
-                                                                                                {
-                                label: '实发金额',
-                                value: 'netAmount',
-                                show: true
-                            },
-                                                                                                {
-                                label: '处理人',
-                                value: 'dealUser',
-                                show: true
-                            },
-                                                                                                {
-                                label: '成交时间',
-                                value: 'dealTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '微信',
-                                value: 'wechat',
-                                show: true
-                            },
-                                                                                                {
-                                label: '支付宝',
-                                value: 'alipay',
-                                show: true
-                            },
-                                                                                                {
-                                label: '银行卡号',
-                                value: 'bankCard',
-                                show: true
-                            },
-                                                                                                {
-                                label: '开户行',
-                                value: 'bankName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '开户名',
-                                value: 'openName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '提现方式',
-                                value: 'typeFlag',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark',
-                                show: true
-                            },
-                                                                                                {
-                                label: '提现CODE',
-                                value: 'tixianCode',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id'
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '用户',
-                                value: 'user_id'
-                            },
-                                                                                                {
-                                label: '提现金额',
-                                value: 'money'
-                            },
-                                                                                                {
-                                label: '状态',
-                                value: 'status_flag'
-                            },
-                                                                                                {
-                                label: '手续费',
-                                value: 'fee'
-                            },
-                                                                                                {
-                                label: '实发金额',
-                                value: 'net_amount'
-                            },
-                                                                                                {
-                                label: '处理人',
-                                value: 'deal_user'
-                            },
-                                                                                                {
-                                label: '成交时间',
-                                value: 'deal_time'
-                            },
-                                                                                                {
-                                label: '微信',
-                                value: 'wechat'
-                            },
-                                                                                                {
-                                label: '支付宝',
-                                value: 'alipay'
-                            },
-                                                                                                {
-                                label: '银行卡号',
-                                value: 'bank_card'
-                            },
-                                                                                                {
-                                label: '开户行',
-                                value: 'bank_name'
-                            },
-                                                                                                {
-                                label: '开户名',
-                                value: 'open_name'
-                            },
-                                                                                                {
-                                label: '提现方式',
-                                value: 'type_flag'
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark'
-                            },
-                                                                                                {
-                                label: '提现CODE',
-                                value: 'tixian_code'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
+                statusFlag: this.statusFlag,
             }
+
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
+
+            this.$http.get({
+                url: '/memberCoinTixian/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
+                }
+            })
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
             }
         },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
+        editRow(row) {
+            this.$router.push({
+                path: '/memberCoinTixian',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
                 }
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
 
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
+            this.advancedQuerySearchKey = '';
 
-                this.$http.get({
-                    url: '/memberCoinTixian/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
-                }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/memberCoinTixian',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
+            if (this.advancedQueryFields.length > 0) {
+
+                var templist = [];
+
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
                     }
                 })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
-                }
-            },
-            advancedQuery() {
 
-                this.advancedQuerySearchKey = '';
+                if (templist.length > 0) {
 
-                if (this.advancedQueryFields.length > 0) {
+                    this.advancedQuerySearchKey = templist.join('_;');
+                }
+            }
 
-                    var templist = [];
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
 
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
+            this.orderByStr = '';
 
-                    if (templist.length > 0) {
+            if (this.tableSortFields.length > 0) {
 
-                        this.advancedQuerySearchKey = templist.join('_;');
+                var templist = [];
+
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
                     }
+                })
+
+                if (templist.length > 0) {
+
+                    this.orderByStr = templist.join('_;');
                 }
+            }
 
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/memberCoinTixian/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/memberCoinTixian/del',
+                    data: { id: row.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
                 this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
                 }
-            },
-            tableSortQuery() {
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
 
-                this.orderByStr = '';
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
 
-                if (this.tableSortFields.length > 0) {
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
+        passTestimonials() {
+            var data = {
+                id: this.auditorId,
+                remark: this.testimonials.content,
+                statusFlag: 1,
+                dealUser: this.testimonials.dealUser,
+            };
+
+
+            this.$http.post({
+                url: '../memberCoinTixian/pass',
+                data: data,
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('保存成功');
+                    this.getData();
+                    this.showDialog = false
+                } else {
+                    this.$message.error('保存失败');
+                }
+                this.testimonials = {
+                    content: '',
+                    dealUser: ''
+                }
+                this.auditorId = ''
+            })
 
-                    var templist = [];
+        },
+        failTestimonials() {
+            var data = {
+                id: this.auditorId,
+                remark: this.testimonials.content,
+                statusFlag: 2,
+                dealUser: this.testimonials.dealUser,
+            };
+
+            this.$http.post({
+                url: '../memberCoinTixian/fail',
+                data: data,
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('保存成功');
+                    this.getData();
+                    this.showDialog = false
+                } else {
+                    this.$message.error('保存失败');
+                }
+                this.testimonials = {
+                    content: '',
+                    dealUser: ''
+                }
+                this.auditorId = ''
+            })
 
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
+        },
 
-                    if (templist.length > 0) {
+        approverRow(row) {
 
-                        this.orderByStr = templist.join('_;');
-                    }
-                }
+            this.auditorId = row.id;
+            this.showDialog = true;
 
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/memberCoinTixian/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/memberCoinTixian/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
-                }
+        },
 
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
+        StatusFlagFormatter(row, column, cellValue) {
+
+            var valueStr = '';
+            switch (cellValue) {
+                case 0:
+                    valueStr = '审核中';
+                    break;
+                case 1:
+                    valueStr = '通过';
+                    break
+                case 2:
+                    valueStr = '失败';
+                    break
+            }
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+            return valueStr;
+
+        },
+        TypeFlagFormatter(row, column, cellValue) {
+
+            var valueStr = '';
+            switch (cellValue) {
+                case 0:
+                    valueStr = '微信提现';
+                    break;
+                case 1:
+                    valueStr = '支付宝提现';
+                    break
+                case 2:
+                    valueStr = '银行卡提现';
+                    break
+            }
+
+            return valueStr;
+
+        },
 
-        }
     }
+}
 </script>
 <style lang="less" scoped>
-
 </style>

+ 157 - 0
src/main/vue/src/pages/TixianConfig.vue

@@ -0,0 +1,157 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="120px" label-position="right" size="small"
+                 style="max-width: 500px;">
+            <el-form-item prop="minMoney" label="最小提现额">
+                <el-input type="number" v-model="formData.minMoney" :disabled="'minMoney'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="maxMoney" label="最大提现额">
+                <el-input type="number" v-model="formData.maxMoney" :disabled="'maxMoney'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="dayTimes" label="每日提现次数">
+                <el-input type="number" v-model="formData.dayTimes" :disabled="'dayTimes'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <!-- <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button> -->
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+    import { mapState } from 'vuex'
+    import { format } from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
+
+    export default {
+        name: 'TixianConfig',
+        created() {
+
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/tixianConfig/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        this.formData = res.data;
+                        if (this.$route.query.column) {
+                            this.formData[this.subColumn] = this.subValue;
+                        }
+                    }
+                })
+            } else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+                subColumn: '',
+                subValue: '',
+            }
+        },
+        computed: {
+            ...mapState(['userInfo']),
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.logicalValidate();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            logicalValidate() {
+                let logicalData = {
+                };
+
+                if (JSON.stringify(logicalData) == '{}') {
+                    this.submit();
+                } else {
+                    this.$http.get({
+                        url: '/tixianConfig/getOne',
+                        data: logicalData
+                    }).then(res => {
+                        if (res.success) {
+                            let logicalFlag = true;
+                            if (res.data) {
+                                if (this.formData.id) {
+                                    if (res.data.id != this.formData.id) {
+                                        logicalFlag = false;
+                                    }
+                                } else {
+                                    logicalFlag = false;
+                                }
+                            }
+
+                            if (logicalFlag) {
+                                this.submit();
+                            } else {
+                                this.$message.warning('逻辑关键字:'+''+'验证失败')
+                            }
+
+                        } else {
+                            this.$message.warning('逻辑关键字:'+''+'验证失败')
+                        }
+                    });
+                }
+            },
+            submit() {
+                let data = {...this.formData};
+
+                                                                                                                                                                                
+                this.$http.post({
+                    url: this.formData.id ? '/tixianConfig/update' : '/tixianConfig/save',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        // this.$router.go(-1);
+                    } else {
+                        this.$message.warning('失败')
+                    }
+                });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
+                    return this.$http.post({
+                        url: '/tixianConfig/del',
+                        data: { id: this.formData.id }
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

+ 472 - 0
src/main/vue/src/pages/TixianConfigs.vue

@@ -0,0 +1,472 @@
+<template>
+    <div>
+        <div class="filters-container">
+        
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
+                       icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
+                       icon="el-icon-sort" class="filter-item">排序
+            </el-button>
+            <el-button @click="$router.push({path:'/tixianConfig',query:{column:$route.query.column}})" type="primary"
+                       size="small" icon="el-icon-edit"
+                       class="filter-item">添加
+            </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table
+                :data="tableData"
+                :height="tableHeight"
+                row-key="id"
+                ref="table">
+            <el-table-column
+                    v-if="multipleMode"
+                    align="center"
+                    type="selection"
+                    width="50">
+            </el-table-column>
+            <el-table-column
+                    type="index"
+                    min-width="50"
+                    align="center">
+            </el-table-column>
+                            
+                                            <el-table-column
+                                v-if="isColumnShow('id')"
+                                prop="id"
+                                label="ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                                                                                                                                                            
+                                            <el-table-column
+                                v-if="isColumnShow('minMoney')"
+                                prop="minMoney"
+                                label="最小提现额"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('maxMoney')"
+                                prop="maxMoney"
+                                label="最大提现额"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('dayTimes')"
+                                prop="dayTimes"
+                                label="每日提现次数"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark')"
+                                prop="remark"
+                                label="备注"
+                                min-width="100">
+                        </el-table-column>
+                                                            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150"
+            >
+                <template slot-scope="scope">
+                                        <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination
+                    background
+                    @size-change="pageSizeChange"
+                    @current-change="currentPageChange"
+                    :current-page="currentPage"
+                    :page-sizes="[10, 20, 30, 40, 50]"
+                    :page-size="pageSize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item"
+                                       :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+    import {mapState} from 'vuex'
+    import {format} from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
+
+    export default {
+        name: 'TixianConfigs',
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                tableData: [],
+                filter1: '',
+                filter2: '',
+                tableColumns: [
+                                                                        {
+                                label: 'ID',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                            {
+                                label: '最小提现额',
+                                value: 'minMoney',
+                                show: true
+                            },
+                                                                                                {
+                                label: '最大提现额',
+                                value: 'maxMoney',
+                                show: true
+                            },
+                                                                                                {
+                                label: '每日提现次数',
+                                value: 'dayTimes',
+                                show: true
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark',
+                                show: true
+                            },
+                                                            ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
+                                label: '最小提现额',
+                                value: 'min_money'
+                            },
+                                                                                                {
+                                label: '最大提现额',
+                                value: 'max_money'
+                            },
+                                                                                                {
+                                label: '每日提现次数',
+                                value: 'day_times'
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark'
+                            },
+                                                            ],
+                advancedQuerySearchKey: '',
+                orderByStr: '',
+                imgSrc: '',
+                imageDialogVisible: false,
+            }
+        },
+        computed: {
+            ...mapState(['tableHeight']),
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            pageSizeChange(size) {
+                this.currentPage = 1;
+                this.pageSize = size;
+                this.getData();
+            },
+            currentPageChange(page) {
+                this.currentPage = page;
+                this.getData();
+            },
+            getData() {
+
+                var data = {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    searchKey: this.filter1,
+                    advancedQuery: this.advancedQuerySearchKey,
+                    orderByStr: this.orderByStr,
+                }
+
+                if (this.$route.query.column) {
+                    var tempColumn = this.$route.query.column;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                }
+
+                this.$http.get({
+                    url: '/tixianConfig/page',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.tableData = res.data.pp;
+                    }
+                })
+            },
+            isColumnShow(column) {
+                var row = this.tableColumns.find(i => i.value === column);
+                return row ? row.show : false;
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: '/tixianConfig',
+                    query: {
+                        id: row.id,
+                        column: this.$route.query.column,
+                    }
+                })
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            addField() {
+                this.advancedQueryFields.push({
+                    link: 'AND',
+                    name: '',
+                    searchMethod: '=',
+                    value: '',
+                });
+            },
+            removeField(i) {
+                if (this.advancedQueryFields.length > 0) {
+                    this.advancedQueryFields.splice(i, 1);
+                }
+            },
+            advancedQuery() {
+
+                this.advancedQuerySearchKey = '';
+
+                if (this.advancedQueryFields.length > 0) {
+
+                    var templist = [];
+
+                    this.advancedQueryFields.forEach(item => {
+                        if (item.link && item.name && item.searchMethod && item.value) {
+                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
+
+                        this.advancedQuerySearchKey = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showAdvancedQueryDialog = false;
+            },
+            addSortField() {
+                this.tableSortFields.push({
+                    name: '',
+                    order: 'asc',
+                });
+            },
+            removeSortField(i) {
+                if (this.tableSortFields.length > 0) {
+                    this.tableSortFields.splice(i, 1);
+                }
+            },
+            tableSortQuery() {
+
+                this.orderByStr = '';
+
+                if (this.tableSortFields.length > 0) {
+
+                    var templist = [];
+
+                    this.tableSortFields.forEach(item => {
+                        if (item.name && item.order) {
+                            var tempItem = item.name + '_,' + item.order;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
+
+                        this.orderByStr = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showTableSortDialog = false;
+            },
+            exportExcel() {
+                window.location.href = this.$baseUrl + "/tixianConfig/exportExcel?searchKey="
+                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
+            },
+            searchData() {
+                this.currentPage = 1;
+                this.getData();
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post({
+                        url: '/tixianConfig/del',
+                        data: {id: row.id}
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+            DateTimeFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+                }
+
+            },
+            DateFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
+                }
+
+            },
+            showImg(img) {
+                this.imgSrc = img;
+                this.imageDialogVisible = true;
+            },
+
+        }
+    }
+</script>
+<style lang="less" scoped>
+
+</style>

+ 10 - 0
src/main/vue/src/router/index.js

@@ -474,6 +474,16 @@ const router = new Router({
                     path: '/phoneInfos',
                     name: 'PhoneInfos',
                     component: () => import('../pages/PhoneInfos')
+                },
+                {
+                    path: '/tixianConfig',
+                    name: 'TixianConfig',
+                    component: () => import('../pages/TixianConfig')
+                },
+                {
+                    path: '/tixianConfigs',
+                    name: 'TixianConfigs',
+                    component: () => import('../pages/TixianConfigs')
                 }
                 /**INSERT_LOCATION**/
             ],

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff