提现

src/main/java/com/izouma/awesomeadmin/model/MemberCoinTixian.java

@@ -2,13 +2,14 @@ package com.izouma.awesomeadmin.model;
 
 import java.math.BigDecimal;
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class MemberCoinTixian{
+public class MemberCoinTixian {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -31,199 +32,228 @@ public class MemberCoinTixian{
     private String remark;
     private String tixianCode;
 
-private String idStr;
+    private String idStr;
+
+    private String searchKey;
 
-private String searchKey;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    private UserInfo userInfo;
 
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public Integer getUserId(){
+
+    public Integer getUserId() {
         return this.userId;
     }
 
-    public void setUserId(Integer userId){
+    public void setUserId(Integer userId) {
         this.userId = userId;
     }
-    public BigDecimal getMoney(){
+
+    public BigDecimal getMoney() {
         return this.money;
     }
 
-    public void setMoney(BigDecimal money){
+    public void setMoney(BigDecimal money) {
         this.money = money;
     }
-    public Integer getStatusFlag(){
+
+    public Integer getStatusFlag() {
         return this.statusFlag;
     }
 
-    public void setStatusFlag(Integer statusFlag){
+    public void setStatusFlag(Integer statusFlag) {
         this.statusFlag = statusFlag;
     }
-    public BigDecimal getFee(){
+
+    public BigDecimal getFee() {
         return this.fee;
     }
 
-    public void setFee(BigDecimal fee){
+    public void setFee(BigDecimal fee) {
         this.fee = fee;
     }
-    public BigDecimal getNetAmount(){
+
+    public BigDecimal getNetAmount() {
         return this.netAmount;
     }
 
-    public void setNetAmount(BigDecimal netAmount){
+    public void setNetAmount(BigDecimal netAmount) {
         this.netAmount = netAmount;
     }
-    public String getDealUser(){
+
+    public String getDealUser() {
         return this.dealUser;
     }
 
-    public void setDealUser(String dealUser){
+    public void setDealUser(String dealUser) {
         this.dealUser = dealUser;
     }
-    public Date getDealTime(){
+
+    public Date getDealTime() {
         return this.dealTime;
     }
 
-    public void setDealTime(Date dealTime){
+    public void setDealTime(Date dealTime) {
         this.dealTime = dealTime;
     }
-    public String getWechat(){
+
+    public String getWechat() {
         return this.wechat;
     }
 
-    public void setWechat(String wechat){
+    public void setWechat(String wechat) {
         this.wechat = wechat;
     }
-    public String getAlipay(){
+
+    public String getAlipay() {
         return this.alipay;
     }
 
-    public void setAlipay(String alipay){
+    public void setAlipay(String alipay) {
         this.alipay = alipay;
     }
-    public String getBankCard(){
+
+    public String getBankCard() {
         return this.bankCard;
     }
 
-    public void setBankCard(String bankCard){
+    public void setBankCard(String bankCard) {
         this.bankCard = bankCard;
     }
-    public String getBankName(){
+
+    public String getBankName() {
         return this.bankName;
     }
 
-    public void setBankName(String bankName){
+    public void setBankName(String bankName) {
         this.bankName = bankName;
     }
-    public String getOpenName(){
+
+    public String getOpenName() {
         return this.openName;
     }
 
-    public void setOpenName(String openName){
+    public void setOpenName(String openName) {
         this.openName = openName;
     }
-    public Integer getTypeFlag(){
+
+    public Integer getTypeFlag() {
         return this.typeFlag;
     }
 
-    public void setTypeFlag(Integer typeFlag){
+    public void setTypeFlag(Integer typeFlag) {
         this.typeFlag = typeFlag;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-    public String getTixianCode(){
+
+    public String getTixianCode() {
         return this.tixianCode;
     }
 
-    public void setTixianCode(String tixianCode){
+    public void setTixianCode(String tixianCode) {
         this.tixianCode = tixianCode;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
 
+    public UserInfo getUserInfo() {
+        return userInfo;
+    }
+
+    public void setUserInfo(UserInfo userInfo) {
+        this.userInfo = userInfo;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/web/MemberCoinTixianController.java

@@ -262,6 +262,7 @@ public class MemberCoinTixianController {
     @ResponseBody
     public Result pass(MemberCoinTixian memberCoinTixian) {
 
+        memberCoinTixian.setDealTime(new Date());
         boolean num = memberCoinTixianService.updateMemberCoinTixian(memberCoinTixian);
         if (num) {
             return new Result(true, "保存成功");

src/main/vue/src/pages/MemberCoinTixians.vue

@@ -42,44 +42,39 @@
             <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 v-if="isColumnShow('openName')" prop="openName" label="姓名" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('netAmount')" prop="netAmount" label="实发金额" min-width="100">
+            <el-table-column v-if="isColumnShow('alipay')" prop="alipay" label="支付宝" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('dealUser')" prop="dealUser" label="放款人" min-width="100">
+            <el-table-column v-if="isColumnShow('bankCard')" prop="bankCard" label="银行卡号" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('dealTime')" prop="dealTime" label="放款时间" min-width="100">
+            <el-table-column v-if="isColumnShow('bankName')" prop="bankName" 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('typeFlag')" prop="typeFlag" :formatter="TypeFlagFormatter" label="类型" min-width="100">
+            </el-table-column> -->
 
-            <el-table-column v-if="isColumnShow('alipay')" prop="alipay" label="支付宝" min-width="100">
+            <el-table-column v-if="isColumnShow('fee')" prop="fee" label="手续费" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('bankCard')" prop="bankCard" label="银行卡号" min-width="100">
+            <el-table-column v-if="isColumnShow('netAmount')" prop="netAmount" label="实发金额" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('bankName')" prop="bankName" label="开户行" min-width="100">
+            <el-table-column v-if="isColumnShow('dealUser')" prop="dealUser" label="放款人" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('openName')" prop="openName" label="开户人" min-width="100">
+            <el-table-column v-if="isColumnShow('dealTime')" prop="dealTime" 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>
@@ -204,9 +199,9 @@
     </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() {
@@ -225,72 +220,72 @@ export default {
                 {
                     label: '用户',
                     value: 'userId',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '金额',
                     value: 'money',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '状态',
                     value: 'statusFlag',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '手续费',
                     value: 'fee',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '实发金额',
                     value: 'netAmount',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '放款人',
                     value: 'dealUser',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '放款时间',
                     value: 'dealTime',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '微信',
                     value: 'wechat',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '支付宝',
                     value: 'alipay',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '银行卡号',
                     value: 'bankCard',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '开户行',
                     value: 'bankName',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '开户人',
                     value: 'openName',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '类型',
                     value: 'typeFlag',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '备注',
                     value: 'remark',
-                    show: true
+                    show: true,
                 },
             ],
             multipleMode: false,
@@ -302,59 +297,59 @@ export default {
             advancedQueryColumns: [
                 {
                     label: '用户',
-                    value: 'user_id'
+                    value: 'user_id',
                 },
                 {
                     label: '金额',
-                    value: 'money'
+                    value: 'money',
                 },
                 {
                     label: '状态',
-                    value: 'status_flag'
+                    value: 'status_flag',
                 },
                 {
                     label: '手续费',
-                    value: 'fee'
+                    value: 'fee',
                 },
                 {
                     label: '实发金额',
-                    value: 'net_amount'
+                    value: 'net_amount',
                 },
                 {
                     label: '放款人',
-                    value: 'deal_user'
+                    value: 'deal_user',
                 },
                 {
                     label: '放款时间',
-                    value: 'deal_time'
+                    value: 'deal_time',
                 },
                 {
                     label: '微信',
-                    value: 'wechat'
+                    value: 'wechat',
                 },
                 {
                     label: '支付宝',
-                    value: 'alipay'
+                    value: 'alipay',
                 },
                 {
                     label: '银行卡号',
-                    value: 'bank_card'
+                    value: 'bank_card',
                 },
                 {
                     label: '开户行',
-                    value: 'bank_name'
+                    value: 'bank_name',
                 },
                 {
                     label: '开户人',
-                    value: 'open_name'
+                    value: 'open_name',
                 },
                 {
                     label: '类型',
-                    value: 'type_flag'
+                    value: 'type_flag',
                 },
                 {
                     label: '备注',
-                    value: 'remark'
+                    value: 'remark',
                 },
             ],
             advancedQuerySearchKey: '',
@@ -364,23 +359,22 @@ export default {
             showDialog: false,
             testimonials: {
                 content: '',
-                dealUser: ''
-
+                dealUser: '',
             },
             auditorId: '',
-             statusFlagOptions: [
+            statusFlagOptions: [
                 { label: '审核中', value: '0' },
                 { label: '通过', value: '1' },
-                { label: '失败', value: '2' }
+                { label: '失败', value: '2' },
             ],
-            statusFlag: '0'
-        }
+            statusFlag: '0',
+        };
     },
     computed: {
         ...mapState(['tableHeight']),
         selection() {
             return this.$refs.table.selection.map(i => i.id);
-        }
+        },
     },
     methods: {
         pageSizeChange(size) {
@@ -393,7 +387,6 @@ export default {
             this.getData();
         },
         getData() {
-
             var data = {
                 currentPage: this.currentPage,
                 pageNumber: this.pageSize,
@@ -401,22 +394,24 @@ export default {
                 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;
-                }
-            })
+            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);
@@ -434,13 +429,13 @@ export default {
                 query: {
                     id: row.id,
                     column: this.$route.query.column,
-                }
-            })
+                },
+            });
         },
         operation1() {
             this.$notify({
                 title: '提示',
-                message: this.selection
+                message: this.selection,
             });
         },
         operation2() {
@@ -460,22 +455,31 @@ export default {
             }
         },
         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;
+                    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('_;');
                 }
             }
@@ -495,11 +499,9 @@ export default {
             }
         },
         tableSortQuery() {
-
             this.orderByStr = '';
 
             if (this.tableSortFields.length > 0) {
-
                 var templist = [];
 
                 this.tableSortFields.forEach(item => {
@@ -507,10 +509,9 @@ export default {
                         var tempItem = item.name + '_,' + item.order;
                         templist.push(tempItem);
                     }
-                })
+                });
 
                 if (templist.length > 0) {
-
                     this.orderByStr = templist.join('_;');
                 }
             }
@@ -519,41 +520,50 @@ export default {
             this.showTableSortDialog = false;
         },
         exportExcel() {
-            window.location.href = this.$baseUrl + "/memberCoinTixian/exportExcel?searchKey="
-                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+            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('删除失败');
-                }
+            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 })
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh });
             }
-
         },
         DateFormatter(row, column, cellValue) {
             if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh });
             }
-
         },
         showImg(img) {
             this.imgSrc = img;
@@ -567,25 +577,25 @@ export default {
                 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 = ''
-            })
-
+            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 = '';
+                });
         },
         failTestimonials() {
             var data = {
@@ -595,35 +605,33 @@ export default {
                 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.$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 = '';
+                });
         },
 
         approverRow(row) {
-
             this.auditorId = row.id;
             this.showDialog = true;
-
         },
 
         StatusFlagFormatter(row, column, cellValue) {
-
             var valueStr = '';
             switch (cellValue) {
                 case 0:
@@ -631,17 +639,15 @@ export default {
                     break;
                 case 1:
                     valueStr = '通过';
-                    break
+                    break;
                 case 2:
                     valueStr = '失败';
-                    break
+                    break;
             }
 
             return valueStr;
-
         },
         TypeFlagFormatter(row, column, cellValue) {
-
             var valueStr = '';
             switch (cellValue) {
                 case 0:
@@ -649,18 +655,16 @@ export default {
                     break;
                 case 1:
                     valueStr = '支付宝提现';
-                    break
+                    break;
                 case 2:
                     valueStr = '银行卡提现';
-                    break
+                    break;
             }
 
             return valueStr;
-
         },
-
-    }
-}
+    },
+};
 </script>
 <style lang="less" scoped>
 </style>