Augcl
/
employ-admin
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

提现审核

master
cgx 2 months ago
parent
42e59e31ba
commit
fdef3c642c
6 changed files with 610 additions and 2 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +309
    -0
      admin-hanhai-vue/src/views/rechargeInfoLog2/MerRechargeInfoLogList.vue
  2. +129
    -0
      admin-hanhai-vue/src/views/rechargeInfoLog2/modules/MerRechargeInfoLogForm.vue
  3. +84
    -0
      admin-hanhai-vue/src/views/rechargeInfoLog2/modules/MerRechargeInfoLogModal.Style#Drawer.vue
  4. +60
    -0
      admin-hanhai-vue/src/views/rechargeInfoLog2/modules/MerRechargeInfoLogModal.vue
  5. +26
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/controller/TbRechargeInfoLogController.java
  6. +2
    -2
      jeecg-boot-module-system/src/main/resources/application-prod.yml

+ 309
- 0
admin-hanhai-vue/src/views/rechargeInfoLog2/MerRechargeInfoLogList.vue View File

@ -0,0 +1,309 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('mer_recharge_info_log')">导出</a-button>-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<!-- <a-button type="primary" icon="import">导入</a-button>-->
<!-- </a-upload>-->
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
<!-- </a-menu>-->
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="ellipsisSlot" slot-scope="text">
<j-ellipsis :value="text"/>
</template>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<div v-if="record.state==0">
<a-popconfirm title="确定通过吗?" @confirm="() => handleAudit(record.id,true)">
<a>通过</a>
</a-popconfirm>
<a-divider type="vertical" />
<!-- <a-popconfirm title="确定不通过吗?" @prompt="() => handleAudit(record.id,false)">-->
<a @click="handleAudit(record.id,false)">不通过</a>
<!-- </a-popconfirm>-->
</div>
<div v-if="record.state == 1">
<a-divider type="vertical" />
<a-popconfirm title="确定打款吗?" @confirm="() => handleWithdrawal(record.id)">
<a>打款</a>
</a-popconfirm>
</div>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<!-- <a-menu-item>-->
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<!-- <a>删除</a>-->
<!-- </a-popconfirm>-->
<!-- </a-menu-item>-->
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<mer-recharge-info-log-modal ref="modalForm" @ok="modalFormOk"></mer-recharge-info-log-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import MerRechargeInfoLogModal from './modules/MerRechargeInfoLogModal'
import { httpAction, getAction } from '@/api/manage'
export default {
name: 'MerRechargeInfoLogList',
mixins:[JeecgListMixin, mixinDevice],
components: {
MerRechargeInfoLogModal
},
data () {
return {
description: '提现申请管理页面',
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'标题',
align:"center",
dataIndex: 'title'
},
{
title:'用户Id',
align:"center",
dataIndex: 'memberId'
},
{
title:'用户名',
align:"center",
dataIndex: 'memberId_dictText'
},
{
title:'真实姓名',
align:"center",
dataIndex: 'realName'
},
{
title:'金额',
align:"center",
dataIndex: 'money'
},
{
title:'用户原本金额',
align:"center",
dataIndex: 'userMoney'
},
{
title:'备注说明',
align:"center",
dataIndex: 'info',
scopedSlots: {customRender: 'ellipsisSlot'}
},
{
title:'支付时间',
align:"center",
dataIndex: 'payTime'
},
{
title:'类型',
align:"center",
dataIndex: 'type_dictText'
},
{
title:'服务费',
align:"center",
dataIndex: 'serviceCharge'
},
{
title:'审核未通过原因',
align:"center",
dataIndex: 'checkInfo'
},
{
title:'提现审核',
align:"center",
dataIndex: 'state_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/rechargeInfoLog/tbRechargeInfoLog/list2",
delete: "/rechargeInfoLog/tbRechargeInfoLog/delete",
deleteBatch: "/rechargeInfoLog/tbRechargeInfoLog/deleteBatch",
exportXlsUrl: "/rechargeInfoLog/tbRechargeInfoLog/exportXls",
importExcelUrl: "/rechargeInfoLog/tbRechargeInfoLog/importExcel",
auidt: "/rechargeInfoLog/tbRechargeInfoLog/audit",
withdrawal: "/rechargeInfoLog/tbRechargeInfoLog/withdrawal"
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
fieldList.push({type:'BigDecimal',value:'userMoney',text:'用户原本金额',dictCode:''})
fieldList.push({type:'int',value:'isPay',text:'是否支付 0否 1是',dictCode:''})
fieldList.push({type:'string',value:'info',text:'备注说明',dictCode:''})
fieldList.push({type:'date',value:'payTime',text:'支付时间'})
fieldList.push({type:'string',value:'memberId',text:'用户Id',dictCode:''})
fieldList.push({type:'string',value:'wxCode',text:'微信支付返回流水',dictCode:''})
fieldList.push({type:'string',value:'wxInfo',text:'微信支付返回信息',dictCode:''})
fieldList.push({type:'int',value:'type',text:'类型 0支出 1支入',dictCode:''})
fieldList.push({type:'string',value:'orderId',text:'订单id',dictCode:''})
fieldList.push({type:'BigDecimal',value:'serviceCharge',text:'服务费',dictCode:''})
fieldList.push({type:'int',value:'state',text:'提现审核 0未审核 1已审核 2已打款',dictCode:''})
this.superFieldList = fieldList
},
handleAudit(id,status){
let checkInfo= '';
if(status === false){
checkInfo = prompt("请输入不通过的原因")
if(checkInfo === ''){
return;
}
}
let param = {
id:id,
status:status,
checkInfo: checkInfo
}
getAction(this.url.auidt,param).then((res)=>{
if(res.success){
this.reCalculatePage(1)
this.$message.success(res.message);
this.loadData();
}else{
this.$message.warning(res.message);
}
}).finally(() => {
this.confirmLoading = false;
})
},
handleWithdrawal(id){
let param = {
id:id
}
getAction(this.url.withdrawal,param).then((res)=>{
if(res.success){
this.reCalculatePage(1)
this.$message.success(res.message);
this.loadData();
}else{
this.$message.warning(res.message);
}
}).finally(() => {
this.confirmLoading = false;
})
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

+ 129
- 0
admin-hanhai-vue/src/views/rechargeInfoLog2/modules/MerRechargeInfoLogForm.vue View File

@ -0,0 +1,129 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="备注说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="info">
<a-textarea v-model="model.info" placeholder="请输入备注说明" ></a-textarea>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="提现审核 0未审核 1已审核 2已打款 3审核未通过" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
<j-dict-select-tag type="list" v-model="model.state" dictCode="rec_state" placeholder="请选择提现审核 0未审核 1已审核 2已打款 3审核未通过" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'MerRechargeInfoLogForm',
components: {
},
props: {
//表单禁用
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
isPay:0,
delFlag:0,
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
money: [
{ required: true, message: '请输入金额!'},
],
userMoney: [
{ required: true, message: '请输入用户原本金额!'},
],
isPay: [
{ required: true, message: '请输入是否支付 0否 1是!'},
],
delFlag: [
{ required: true, message: '请输入是否删除 0否 1是!'},
],
type: [
{ required: true, message: '请输入类型 0支出 1支入!'},
],
},
url: {
add: "rechargeInfoLog/tbRechargeInfoLog/add",
edit: "rechargeInfoLog/tbRechargeInfoLog/edit",
queryById: "rechargeInfoLog/tbRechargeInfoLog/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//备份model原始值
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
// 触发表单验证
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
}
}
</script>

+ 84
- 0
admin-hanhai-vue/src/views/rechargeInfoLog2/modules/MerRechargeInfoLogModal.Style#Drawer.vue View File

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<mer-recharge-info-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></mer-recharge-info-log-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import MerRechargeInfoLogForm from './MerRechargeInfoLogForm'
export default {
name: 'MerRechargeInfoLogModal',
components: {
MerRechargeInfoLogForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

+ 60
- 0
admin-hanhai-vue/src/views/rechargeInfoLog2/modules/MerRechargeInfoLogModal.vue View File

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<mer-recharge-info-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></mer-recharge-info-log-form>
</j-modal>
</template>
<script>
import MerRechargeInfoLogForm from './MerRechargeInfoLogForm'
export default {
name: 'MerRechargeInfoLogModal',
components: {
MerRechargeInfoLogForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

+ 26
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/controller/TbRechargeInfoLogController.java View File

@ -68,6 +68,32 @@ public class TbRechargeInfoLogController extends JeecgController<TbRechargeInfoL
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param tbRechargeInfoLog
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "tb_recharge_info_log-分页列表查询")
@ApiOperation(value="提现分页列表查询", notes="提现分页列表查询")
@GetMapping(value = "/list2")
public Result<IPage<TbRechargeInfoLog>> list2(TbRechargeInfoLog tbRechargeInfoLog,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TbRechargeInfoLog> queryWrapper = QueryGenerator.initQueryWrapper(tbRechargeInfoLog, req.getParameterMap());
queryWrapper.isNotNull("state");
Page<TbRechargeInfoLog> page = new Page<TbRechargeInfoLog>(pageNo, pageSize);
IPage<TbRechargeInfoLog> pageList = tbRechargeInfoLogService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 提现审核
* @param id


+ 2
- 2
jeecg-boot-module-system/src/main/resources/application-prod.yml View File

@ -331,8 +331,8 @@ third-app:
#配置微信
wechat:
mpAppId:
mpAppSecret:
mpAppId: wx6931d85f7371b032
mpAppSecret: 4bc2d5bdfec7023818ece6ee41613f18
mchId:
mchKey:
keyPath: /usr/local/cert/apiclient_cert.p12


Write Preview
Loading…
Cancel
Save