From 13499ec87c0614d5ae2947aae4cab528f43059f4 Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期六, 08 二月 2025 13:34:34 +0800
Subject: [PATCH] 新增银行流水表
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java | 2
generator/src/test/java/com/xizang/CodeGeneratorTests.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBankFlowMapper.java | 16 ++
ruoyi-system/src/main/java/com/ruoyi/system/query/TBankFlowQuery.java | 60 ++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/TBankFlowService.java | 26 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java | 43 +++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java | 46 +++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/TFlowManagementService.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/model/TBankFlow.java | 90 +++++++++++++++
ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml | 29 ++++
10 files changed, 315 insertions(+), 3 deletions(-)
diff --git a/generator/src/test/java/com/xizang/CodeGeneratorTests.java b/generator/src/test/java/com/xizang/CodeGeneratorTests.java
index 1a91271..eae6969 100644
--- a/generator/src/test/java/com/xizang/CodeGeneratorTests.java
+++ b/generator/src/test/java/com/xizang/CodeGeneratorTests.java
@@ -35,7 +35,7 @@
// 全局配置
GlobalConfig gc = new GlobalConfig();
- String projectPath = "F:\\workSpace\\xizang\\generator";
+ String projectPath = "D:\\畅云\\项目\\xizangweb\\xizang\\generator";
gc.setOutputDir(projectPath + "/src/main/java")
.setAuthor("xiaochen")
.setMapperName("%sMapper")
@@ -144,7 +144,7 @@
// strategy.setTablePrefix(pc.getModuleName() + "");
// strategy.setLikeTable(new LikeTable("room"));
//strategy.setLikeTable(new LikeTable("member"));
- strategy.setLikeTable(new LikeTable("t_"));// 生成表名
+ strategy.setLikeTable(new LikeTable("t_bank_flow"));// 生成表名
// strategy.setLikeTable(new LikeTable("t_hotel"));// 生成表名
// strategy.setLikeTable(new LikeTable("t_scan_message"));// 生成表名
// strategy.setNotLikeTable(new LikeTable("hotel_info"));// 不生成表名
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
new file mode 100644
index 0000000..46bf97f
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
@@ -0,0 +1,43 @@
+package com.ruoyi.web.controller.api;
+
+
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.model.TBankFlow;
+import com.ruoyi.system.model.TFlowManagement;
+import com.ruoyi.system.query.TBankFlowQuery;
+import com.ruoyi.system.query.TFlowManagementQuery;
+import com.ruoyi.system.service.TBankFlowService;
+import com.ruoyi.system.service.TFlowManagementService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 流水管理 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-07
+ */
+@RestController
+@RequestMapping("/t-bank-flow")
+public class TBankFlowController {
+ @Autowired
+ private TBankFlowService flowService;
+ /**
+ * 获取流水列表
+ */
+ @PreAuthorize("@ss.hasPermi('system:bankFlow:list')")
+ @ApiOperation(value = "获取银行流水列表")
+ @PostMapping("/list")
+ public R<PageInfo<TBankFlow>> list(@RequestBody TBankFlowQuery query) {
+ return R.ok(flowService.pageList(query));
+ }
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java
index 51a106c..652d417 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java
@@ -35,9 +35,9 @@
@ApiOperation(value = "获取流水列表")
@PostMapping("/list")
public R<PageInfo<TFlowManagement>> list(@RequestBody TFlowManagementQuery query) {
- PageInfo<TFlowManagement> list = flowService.pageList(query);
return R.ok(flowService.pageList(query));
}
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBankFlowMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBankFlowMapper.java
new file mode 100644
index 0000000..0bf605c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBankFlowMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.model.TBankFlow;
+
+/**
+ * <p>
+ * 流水管理 Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-07
+ */
+public interface TBankFlowMapper extends BaseMapper<TBankFlow> {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBankFlow.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBankFlow.java
new file mode 100644
index 0000000..30e499d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBankFlow.java
@@ -0,0 +1,90 @@
+package com.ruoyi.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 流水管理
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_bank_flow")
+@ApiModel(value="TBankFlow对象", description="流水管理")
+public class TBankFlow implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("id")
+ private String id;
+
+ @ApiModelProperty(value = "银行流水号")
+ @TableField("bank_serial_number")
+ private String bankSerialNumber;
+
+ @ApiModelProperty(value = "流水金额")
+ @TableField("flow_money")
+ private Double flowMoney;
+
+ @ApiModelProperty(value = "抵扣金额")
+ @TableField("deduction_money")
+ private Double deductionMoney;
+
+ @ApiModelProperty(value = "剩余金额")
+ @TableField("remaining_money")
+ private Double remainingMoney;
+
+ @ApiModelProperty(value = "支付时间")
+ @TableField("pay_time")
+ private LocalDateTime payTime;
+
+ @ApiModelProperty(value = "付款人")
+ @TableField("payer")
+ private String payer;
+
+ @ApiModelProperty(value = "流水状态 1=正常 2=异常")
+ @TableField("flow_status")
+ private Integer flowStatus;
+
+ @ApiModelProperty(value = "支付方式 1=微信支付 2=支付宝支付 3=线下支付")
+ @TableField("pay_type")
+ private Integer payType;
+
+ @ApiModelProperty(value = "缴费账单id")
+ @TableField("payment_bill_id")
+ private String paymentBillId;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField("create_time")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "修改时间")
+ @TableField("update_time")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(value = "创建人")
+ @TableField("create_by")
+ private String createBy;
+
+ @ApiModelProperty(value = "修改人")
+ @TableField("update_by")
+ private String updateBy;
+
+ @ApiModelProperty(value = "是否删除 0=否 1=是")
+ @TableField("disabled")
+ private Integer disabled;
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TBankFlowQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TBankFlowQuery.java
new file mode 100644
index 0000000..ae33250
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TBankFlowQuery.java
@@ -0,0 +1,60 @@
+package com.ruoyi.system.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 流水管理
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-07
+ */
+@Data
+@ApiModel(value="银行流水列表query")
+public class TBankFlowQuery extends BasePage {
+
+ @ApiModelProperty(value = "银行流水号")
+ private String bankSerialNumber;
+
+ @ApiModelProperty(value = "流水金额")
+ private Double flowMoney;
+
+ @ApiModelProperty(value = "抵扣金额")
+ private Double deductionMoney;
+
+ @ApiModelProperty(value = "剩余金额")
+ private Double remainingMoney;
+
+ @ApiModelProperty(value = "支付时间")
+ private LocalDateTime payTime;
+
+ @ApiModelProperty(value = "付款人")
+ private String payer;
+
+ @ApiModelProperty(value = "流水状态 1=正常 2=异常")
+ private Integer flowStatus;
+
+ @ApiModelProperty(value = "支付方式 1=微信支付 2=支付宝支付 3=线下支付")
+ private Integer payType;
+
+ @ApiModelProperty(value = "缴费账单id")
+ private String paymentBillId;
+
+ @ApiModelProperty(value = "支付开始时间")
+ private String payStartTime;
+
+ @ApiModelProperty(value = "支付结束时间")
+ private String payEndTime;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBankFlowService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBankFlowService.java
new file mode 100644
index 0000000..6e945d3
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBankFlowService.java
@@ -0,0 +1,26 @@
+package com.ruoyi.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.model.TBankFlow;
+import com.ruoyi.system.model.TFlowManagement;
+import com.ruoyi.system.query.TBankFlowQuery;
+import com.ruoyi.system.query.TFlowManagementQuery;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 流水管理 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-07
+ */
+public interface TBankFlowService extends IService<TBankFlow> {
+
+ PageInfo<TBankFlow> pageList(TBankFlowQuery query);
+ List<TBankFlow> makeQuery(TBankFlowQuery query);
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TFlowManagementService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TFlowManagementService.java
index 836dd30..5560db0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TFlowManagementService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TFlowManagementService.java
@@ -19,4 +19,6 @@
PageInfo<TFlowManagement> pageList(TFlowManagementQuery query);
List<TFlowManagement> makeQuery(TFlowManagementQuery query);
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java
new file mode 100644
index 0000000..723c203
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java
@@ -0,0 +1,46 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.TBankFlowMapper;
+import com.ruoyi.system.model.TBankFlow;
+import com.ruoyi.system.model.TFlowManagement;
+import com.ruoyi.system.query.TBankFlowQuery;
+import com.ruoyi.system.service.TBankFlowService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 流水管理 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-07
+ */
+@Service
+public class TBankFlowServiceImpl extends ServiceImpl<TBankFlowMapper, TBankFlow> implements TBankFlowService {
+ @Override
+ public PageInfo<TBankFlow> pageList(TBankFlowQuery query) {
+ PageInfo<TBankFlow> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TBankFlow> list = makeQuery(query);
+ pageInfo.setRecords(list);
+ pageInfo.setTotal(list.size());
+ return pageInfo;
+ }
+ @Override
+ public List<TBankFlow> makeQuery(TBankFlowQuery query) {
+ LambdaQueryWrapper<TBankFlow> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(StringUtils.isNotEmpty(query.getBankSerialNumber()),TBankFlow::getBankSerialNumber,query.getBankSerialNumber())
+ .like(StringUtils.isNotEmpty(query.getPayer()),TBankFlow::getPayer,query.getPayer())
+ .ge(StringUtils.isNotEmpty(query.getPayStartTime()),TBankFlow::getPayTime,query.getPayStartTime())
+ .lt(StringUtils.isNotEmpty(query.getPayEndTime()),TBankFlow::getPayTime,query.getPayEndTime())
+ .eq(null != query.getFlowStatus(),TBankFlow::getFlowStatus,query.getFlowStatus())
+ .orderByDesc(TBankFlow::getCreateTime)
+ ;
+ return this.baseMapper.selectList(queryWrapper);
+ }
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml
new file mode 100644
index 0000000..61d5859
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TBankFlowMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TBankFlow">
+ <id column="id" property="id" />
+ <result column="bank_serial_number" property="bankSerialNumber" />
+ <result column="flow_money" property="flowMoney" />
+ <result column="deduction_money" property="deductionMoney" />
+ <result column="remaining_money" property="remainingMoney" />
+ <result column="pay_time" property="payTime" />
+ <result column="payer" property="payer" />
+ <result column="flow_status" property="flowStatus" />
+ <result column="pay_type" property="payType" />
+ <result column="payment_bill_id" property="paymentBillId" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_by" property="createBy" />
+ <result column="update_by" property="updateBy" />
+ <result column="disabled" property="disabled" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, bank_serial_number, flow_money, deduction_money, remaining_money, pay_time, payer, flow_status, pay_type, payment_bill_id, create_time, update_time, create_by, update_by, disabled
+ </sql>
+
+</mapper>
--
Gitblit v1.7.1