主管理员 1 month ago
parent
commit
a43d27a5c8
19 changed files with 1213 additions and 6 deletions
  1. +1
    -1
      admin-hanhai-vue/.env.development
  2. +171
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/controller/EmployWithdrawalController.java
  3. +78
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/entity/EmployWithdrawal.java
  4. +17
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/mapper/EmployWithdrawalMapper.java
  5. +5
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/mapper/xml/EmployWithdrawalMapper.xml
  6. +14
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/service/IEmployWithdrawalService.java
  7. +19
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/service/impl/EmployWithdrawalServiceImpl.java
  8. +209
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue/EmployWithdrawalList.vue
  9. +129
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue/modules/EmployWithdrawalForm.vue
  10. +84
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue/modules/EmployWithdrawalModal.Style#Drawer.vue
  11. +60
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue/modules/EmployWithdrawalModal.vue
  12. +61
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue3/EmployWithdrawal.api.ts
  13. +84
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue3/EmployWithdrawal.data.ts
  14. +162
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue3/EmployWithdrawalList.vue
  15. +58
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue3/components/EmployWithdrawalModal.vue
  16. +8
    -2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/AmountController.java
  17. +2
    -1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/AmountService.java
  18. +50
    -2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java
  19. +1
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/SeekServiceImpl.java

+ 1
- 1
admin-hanhai-vue/.env.development View File

@ -1,5 +1,5 @@
NODE_ENV=development
VUE_APP_API_BASE_URL=http://localhost:8003/employ-api/
VUE_APP_API_BASE_URL=http://localhost:8002/employ-api/
//VUE_APP_API_BASE_URL=http://localhost:8000/employ-api/
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview


+ 171
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/controller/EmployWithdrawalController.java View File

@ -0,0 +1,171 @@
package org.jeecg.modules.employWithdrawal.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.employWithdrawal.entity.EmployWithdrawal;
import org.jeecg.modules.employWithdrawal.service.IEmployWithdrawalService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 提现
* @Author: jeecg-boot
* @Date: 2025-09-26
* @Version: V1.0
*/
@Api(tags="提现")
@RestController
@RequestMapping("/employWithdrawal/employWithdrawal")
@Slf4j
public class EmployWithdrawalController extends JeecgController<EmployWithdrawal, IEmployWithdrawalService> {
@Autowired
private IEmployWithdrawalService employWithdrawalService;
/**
* 分页列表查询
*
* @param employWithdrawal
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "提现-分页列表查询")
@ApiOperation(value="提现-分页列表查询", notes="提现-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<EmployWithdrawal>> queryPageList(EmployWithdrawal employWithdrawal,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<EmployWithdrawal> queryWrapper = QueryGenerator.initQueryWrapper(employWithdrawal, req.getParameterMap());
Page<EmployWithdrawal> page = new Page<EmployWithdrawal>(pageNo, pageSize);
IPage<EmployWithdrawal> pageList = employWithdrawalService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param employWithdrawal
* @return
*/
@AutoLog(value = "提现-添加")
@ApiOperation(value="提现-添加", notes="提现-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody EmployWithdrawal employWithdrawal) {
employWithdrawalService.save(employWithdrawal);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param employWithdrawal
* @return
*/
@AutoLog(value = "提现-编辑")
@ApiOperation(value="提现-编辑", notes="提现-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody EmployWithdrawal employWithdrawal) {
employWithdrawalService.updateById(employWithdrawal);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "提现-通过id删除")
@ApiOperation(value="提现-通过id删除", notes="提现-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
employWithdrawalService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "提现-批量删除")
@ApiOperation(value="提现-批量删除", notes="提现-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.employWithdrawalService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "提现-通过id查询")
@ApiOperation(value="提现-通过id查询", notes="提现-通过id查询")
@GetMapping(value = "/queryById")
public Result<EmployWithdrawal> queryById(@RequestParam(name="id",required=true) String id) {
EmployWithdrawal employWithdrawal = employWithdrawalService.getById(id);
if(employWithdrawal==null) {
return Result.error("未找到对应数据");
}
return Result.OK(employWithdrawal);
}
/**
* 导出excel
*
* @param request
* @param employWithdrawal
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, EmployWithdrawal employWithdrawal) {
return super.exportXls(request, employWithdrawal, EmployWithdrawal.class, "提现");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, EmployWithdrawal.class);
}
}

+ 78
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/entity/EmployWithdrawal.java View File

@ -0,0 +1,78 @@
package org.jeecg.modules.employWithdrawal.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 提现
* @Author: jeecg-boot
* @Date: 2025-09-26
* @Version: V1.0
*/
@Data
@TableName("employ_withdrawal")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="employ_withdrawal对象", description="提现")
public class EmployWithdrawal implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
/**用户*/
@Excel(name = "用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "用户")
private java.lang.String userId;
/**真实姓名*/
@Excel(name = "真实姓名", width = 15)
@ApiModelProperty(value = "真实姓名")
private java.lang.String realName;
/**银行卡号*/
@Excel(name = "银行卡号", width = 15)
@ApiModelProperty(value = "银行卡号")
private java.lang.String bankCard;
/**开户行*/
@Excel(name = "开户行", width = 15)
@ApiModelProperty(value = "开户行")
private java.lang.String bankName;
/**金额*/
@Excel(name = "金额", width = 15)
@ApiModelProperty(value = "金额")
private java.math.BigDecimal money;
/**打款凭证*/
@Excel(name = "打款凭证", width = 15)
@ApiModelProperty(value = "打款凭证")
private java.lang.String voucher;
}

+ 17
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/mapper/EmployWithdrawalMapper.java View File

@ -0,0 +1,17 @@
package org.jeecg.modules.employWithdrawal.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.employWithdrawal.entity.EmployWithdrawal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 提现
* @Author: jeecg-boot
* @Date: 2025-09-26
* @Version: V1.0
*/
public interface EmployWithdrawalMapper extends BaseMapper<EmployWithdrawal> {
}

+ 5
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/mapper/xml/EmployWithdrawalMapper.xml View File

@ -0,0 +1,5 @@
<?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="org.jeecg.modules.employWithdrawal.mapper.EmployWithdrawalMapper">
</mapper>

+ 14
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/service/IEmployWithdrawalService.java View File

@ -0,0 +1,14 @@
package org.jeecg.modules.employWithdrawal.service;
import org.jeecg.modules.employWithdrawal.entity.EmployWithdrawal;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 提现
* @Author: jeecg-boot
* @Date: 2025-09-26
* @Version: V1.0
*/
public interface IEmployWithdrawalService extends IService<EmployWithdrawal> {
}

+ 19
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/service/impl/EmployWithdrawalServiceImpl.java View File

@ -0,0 +1,19 @@
package org.jeecg.modules.employWithdrawal.service.impl;
import org.jeecg.modules.employWithdrawal.entity.EmployWithdrawal;
import org.jeecg.modules.employWithdrawal.mapper.EmployWithdrawalMapper;
import org.jeecg.modules.employWithdrawal.service.IEmployWithdrawalService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 提现
* @Author: jeecg-boot
* @Date: 2025-09-26
* @Version: V1.0
*/
@Service
public class EmployWithdrawalServiceImpl extends ServiceImpl<EmployWithdrawalMapper, EmployWithdrawal> implements IEmployWithdrawalService {
}

+ 209
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue/EmployWithdrawalList.vue View File

@ -0,0 +1,209 @@
<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('提现')">导出</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="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text,record">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" :preview="record.id" 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>
<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>
<employ-withdrawal-modal ref="modalForm" @ok="modalFormOk"></employ-withdrawal-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import EmployWithdrawalModal from './modules/EmployWithdrawalModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'EmployWithdrawalList',
mixins:[JeecgListMixin, mixinDevice],
components: {
EmployWithdrawalModal
},
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: 'createTime'
},
{
title:'用户',
align:"center",
dataIndex: 'userId_dictText'
},
{
title:'真实姓名',
align:"center",
dataIndex: 'realName'
},
{
title:'银行卡号',
align:"center",
dataIndex: 'bankCard'
},
{
title:'开户行',
align:"center",
dataIndex: 'bankName'
},
{
title:'金额',
align:"center",
dataIndex: 'money'
},
{
title:'打款凭证',
align:"center",
dataIndex: 'voucher',
scopedSlots: {customRender: 'imgSlot'}
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/employWithdrawal/employWithdrawal/list",
delete: "/employWithdrawal/employWithdrawal/delete",
deleteBatch: "/employWithdrawal/employWithdrawal/deleteBatch",
exportXlsUrl: "/employWithdrawal/employWithdrawal/exportXls",
importExcelUrl: "employWithdrawal/employWithdrawal/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
fieldList.push({type:'string',value:'realName',text:'真实姓名',dictCode:''})
fieldList.push({type:'string',value:'bankCard',text:'银行卡号',dictCode:''})
fieldList.push({type:'string',value:'bankName',text:'开户行',dictCode:''})
fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
fieldList.push({type:'string',value:'voucher',text:'打款凭证',dictCode:''})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

+ 129
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue/modules/EmployWithdrawalForm.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="userId">
<j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="真实姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="realName">
<a-input v-model="model.realName" placeholder="请输入真实姓名" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="银行卡号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankCard">
<a-input v-model="model.bankCard" placeholder="请输入银行卡号" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankName">
<a-input v-model="model.bankName" placeholder="请输入开户行" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
<a-input-number v-model="model.money" placeholder="请输入金额" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="打款凭证" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="voucher">
<j-image-upload isMultiple v-model="model.voucher" ></j-image-upload>
</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: 'EmployWithdrawalForm',
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/employWithdrawal/employWithdrawal/add",
edit: "/employWithdrawal/employWithdrawal/edit",
queryById: "/employWithdrawal/employWithdrawal/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
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue/modules/EmployWithdrawalModal.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">
<employ-withdrawal-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></employ-withdrawal-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 EmployWithdrawalForm from './EmployWithdrawalForm'
export default {
name: 'EmployWithdrawalModal',
components: {
EmployWithdrawalForm
},
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
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue/modules/EmployWithdrawalModal.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="关闭">
<employ-withdrawal-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></employ-withdrawal-form>
</j-modal>
</template>
<script>
import EmployWithdrawalForm from './EmployWithdrawalForm'
export default {
name: 'EmployWithdrawalModal',
components: {
EmployWithdrawalForm
},
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>

+ 61
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue3/EmployWithdrawal.api.ts View File

@ -0,0 +1,61 @@
import {defHttp} from '/@/utils/http/axios';
import {Modal} from 'ant-design-vue';
enum Api {
list = '/employWithdrawal/employWithdrawal/list',
save='/employWithdrawal/employWithdrawal/add',
edit='/employWithdrawal/employWithdrawal/edit',
deleteOne = '/employWithdrawal/employWithdrawal/delete',
deleteBatch = '/employWithdrawal/employWithdrawal/deleteBatch',
importExcel = '/employWithdrawal/employWithdrawal/importExcel',
exportXls = '/employWithdrawal/employWithdrawal/exportXls',
}
/**
* api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* api
*/
export const getImportUrl = Api.importExcel;
/**
*
* @param params
*/
export const list = (params) =>
defHttp.get({url: Api.list, params});
/**
*
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
*
* @param params
*/
export const batchDelete = (params, handleSuccess) => {
Modal.confirm({
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
*
* @param params
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({url: url, params});
}

+ 84
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue3/EmployWithdrawal.data.ts View File

@ -0,0 +1,84 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '创建日期',
align:"center",
dataIndex: 'createTime'
},
{
title: '用户',
align:"center",
dataIndex: 'userId_dictText'
},
{
title: '真实姓名',
align:"center",
dataIndex: 'realName'
},
{
title: '银行卡号',
align:"center",
dataIndex: 'bankCard'
},
{
title: '开户行',
align:"center",
dataIndex: 'bankName'
},
{
title: '金额',
align:"center",
dataIndex: 'money'
},
{
title: '打款凭证',
align:"center",
dataIndex: 'voucher',
customRender:render.renderAvatar,
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '用户',
field: 'userId',
component: 'JSearchSelect',
componentProps:{
dict:"han_hai_member,nick_name,id"
},
},
{
label: '真实姓名',
field: 'realName',
component: 'Input',
},
{
label: '银行卡号',
field: 'bankCard',
component: 'Input',
},
{
label: '开户行',
field: 'bankName',
component: 'Input',
},
{
label: '金额',
field: 'money',
component: 'InputNumber',
},
{
label: '打款凭证',
field: 'voucher',
component: 'JImageUpload',
componentProps:{
},
},
];

+ 162
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue3/EmployWithdrawalList.vue View File

@ -0,0 +1,162 @@
<template>
<div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-dropdown v-if="checkedKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
</template>
<!--字段回显插槽-->
<template #htmlSlot="{text}">
<div v-html="text"></div>
</template>
<template #fileSlot="{text}">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
</template>
</BasicTable>
<!-- 表单区域 -->
<EmployWithdrawalModal @register="registerModal" @success="handleSuccess"></EmployWithdrawalModal>
</div>
</template>
<script lang="ts" name="employWithdrawal-employWithdrawal" setup>
import {ref, computed, unref} from 'vue';
import {BasicTable, useTable, TableAction} from '/@/components/Table';
import {useModal} from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage'
import EmployWithdrawalModal from './components/EmployWithdrawalModal.vue'
import {columns, searchFormSchema} from './employWithdrawal.data';
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './employWithdrawal.api';
const checkedKeys = ref<Array<string | number>>([]);
//model
const [registerModal, {openModal}] = useModal();
//table
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
tableProps:{
title: '提现',
api: list,
columns,
canResize:false,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
autoSubmitOnEnter:true,
showAdvancedButton:true,
fieldMapToTime: [
],
},
actionColumn: {
width: 120,
},
},
exportConfig: {
name:"提现",
url: getExportUrl,
},
importConfig: {
url: getImportUrl
},
})
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({id: record.id}, reload);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ids: checkedKeys.value}, reload);
}
/**
* 成功回调
*/
function handleSuccess() {
reload();
}
/**
* 操作栏
*/
function getTableAction(record){
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
}
]
}
/**
* 下拉操作栏
*/
function getDropDownAction(record){
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
}
]
}
</script>
<style scoped>
</style>

+ 58
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employWithdrawal/vue3/components/EmployWithdrawalModal.vue View File

@ -0,0 +1,58 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
<BasicForm @register="registerForm"/>
</BasicModal>
</template>
<script lang="ts" setup>
import {ref, computed, unref} from 'vue';
import {BasicModal, useModalInner} from '/@/components/Modal';
import {BasicForm, useForm} from '/@/components/Form/index';
import {formSchema} from '../employWithdrawal.data';
import {saveOrUpdate} from '../employWithdrawal.api';
// Emits
const emit = defineEmits(['register','success']);
const isUpdate = ref(true);
//
const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
labelWidth: 150,
schemas: formSchema,
showActionButtonGroup: false,
});
//
const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
//
await resetFields();
setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
isUpdate.value = !!data?.isUpdate;
if (unref(isUpdate)) {
//
await setFieldsValue({
...data.record,
});
}
//
setProps({ disabled: !data?.showFooter })
});
//
const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
//
async function handleSubmit(v) {
try {
let values = await validate();
setModalProps({confirmLoading: true});
//
await saveOrUpdate(values, isUpdate.value);
//
closeModal();
//
emit('success');
} finally {
setModalProps({confirmLoading: false});
}
}
</script>
<style lang="less" scoped>
</style>

+ 8
- 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/AmountController.java View File

@ -7,6 +7,7 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.apiBean.PageBean;
import org.jeecg.modules.apiService.AmountService;
import org.jeecg.modules.apiService.AuthenticationService;
import org.jeecg.modules.employWithdrawal.entity.EmployWithdrawal;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -37,8 +38,13 @@ public class AmountController {
@ApiOperation(value="我的钱包-提现", notes="我的钱包-提现")
@RequestMapping(value = "/CashOut", method = {RequestMethod.GET})
public Result<?> CashOut(@RequestHeader("X-Access-Token") String token, BigDecimal price){
return amountService.CashOut(token);
public Result<?> CashOut(@RequestHeader("X-Access-Token") String token, BigDecimal money, String realName, String bankCard, String bankName){
EmployWithdrawal withdrawal = new EmployWithdrawal();
withdrawal.setMoney(money);
withdrawal.setRealName(realName);
withdrawal.setBankCard(bankCard);
withdrawal.setBankName(bankName);
return amountService.CashOut(token, withdrawal);
}
@ApiOperation(value="我的钱包-充值", notes="我的钱包-充值")


+ 2
- 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/AmountService.java View File

@ -2,6 +2,7 @@ package org.jeecg.modules.apiService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.apiBean.PageBean;
import org.jeecg.modules.employWithdrawal.entity.EmployWithdrawal;
import org.springframework.web.bind.annotation.RequestHeader;
import java.math.BigDecimal;
@ -15,7 +16,7 @@ public interface AmountService {
public Result<?> CountCashOut(@RequestHeader("X-Access-Token") String token);
//我的钱包-提现
public Result<?> CashOut(@RequestHeader("X-Access-Token") String token);
public Result<?> CashOut(@RequestHeader("X-Access-Token") String token, EmployWithdrawal withdrawal);
//我的钱包-充值
public Result<?> recharge(@RequestHeader("X-Access-Token") String token, BigDecimal price);


+ 50
- 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java View File

@ -13,6 +13,8 @@ import org.jeecg.modules.employAmountLog.entity.EmployAmountLog;
import org.jeecg.modules.employAmountLog.service.IEmployAmountLogService;
import org.jeecg.modules.employTrade.entity.EmployTrade;
import org.jeecg.modules.employTrade.service.IEmployTradeService;
import org.jeecg.modules.employWithdrawal.entity.EmployWithdrawal;
import org.jeecg.modules.employWithdrawal.service.IEmployWithdrawalService;
import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
import org.jeecg.modules.pay.MpWxPayService;
@ -44,6 +46,10 @@ public class AmountServiceImpl implements AmountService {
@Resource
private IEmployAmountLogService employAmountLogService;
//金额明细
@Resource
private IEmployWithdrawalService employWithdrawalService;
@Resource
private IHanHaiMemberService hanHaiMemberService;
/******************************************************************************************************************/
@ -87,8 +93,50 @@ public class AmountServiceImpl implements AmountService {
//我的钱包-提现
@Override
public Result<?> CashOut(String token) {
return Result.OK("接口内容暂未完成");
public Result<?> CashOut(String token, EmployWithdrawal withdrawal) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
try {
// 1. 判断用户金额是否足够
BigDecimal userBalance = hanHaiMember.getPrice() == null ? BigDecimal.ZERO : hanHaiMember.getPrice(); // 用户当前余额
BigDecimal withdrawalAmount = withdrawal.getMoney(); // 提现金额
if (withdrawalAmount == null) {
return Result.error("请填写金额");
}
if (withdrawalAmount.compareTo(BigDecimal.ZERO) <= 0) {
return Result.error("提现金额必须大于0");
}
if (userBalance.compareTo(withdrawalAmount) < 0) {
return Result.error("余额不足,当前余额:" + userBalance + "元");
}
// 2. 减去提现的金额
BigDecimal newBalance = userBalance.subtract(withdrawalAmount);
hanHaiMember.setPrice(newBalance);
hanHaiMemberService.updateById(hanHaiMember);
// 3. 添加流水记录EmployAmountLog
EmployAmountLog amountLog = new EmployAmountLog();
amountLog.setTitle("提现");
amountLog.setAmount(withdrawalAmount);
amountLog.setType("1"); // 支出
amountLog.setUserId(hanHaiMember.getId());
employAmountLogService.save(amountLog);
// 4. 添加提现记录EmployWithdrawal
withdrawal.setUserId(hanHaiMember.getId());
employWithdrawalService.save(withdrawal);
return Result.OK("提现申请成功,提现金额:" + withdrawalAmount + "元,剩余余额:" + newBalance + "元");
} catch (Exception e) {
e.printStackTrace();
return Result.error("提现申请失败:" + e.getMessage());
}
}
//我的钱包-充值


+ 1
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/SeekServiceImpl.java View File

@ -58,6 +58,7 @@ public class SeekServiceImpl implements SeekService {
.like(employSeek.getAddress() != null, EmploySeek::getAddress, employSeek.getAddress())
.orderByDesc(EmploySeek::getCreateTime)
.notIn(EmploySeek::getSeekStatus, 1, 2)
.eq(StringUtils.isNotEmpty(employSeek.getCategoryOne()), EmploySeek::getCategoryOne, employSeek.getCategoryOne())
.page(page);
//创建一个新的集合
for (EmploySeek seek : pageList.getRecords()) {


Loading…
Cancel
Save