From a210e4b0aa871a9e3b0561879d80116a447ac2dc Mon Sep 17 00:00:00 2001 From: huk Date: Fri, 5 Sep 2025 13:59:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor(transaction):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E5=88=86=E8=B4=A6=E6=A8=A1=E5=9E=8B=E9=A2=86=E5=9F=9F=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新 Divide、DivideDetail、DivideRule 和 DivideRuleDetail 类 - 添加 delFlag 字段并配置为逻辑删除 - 修改 DivideMapper.xml 中的查询条件，增加逻辑删除判断- 继承 BaseAudit 以支持审计字段 --- .../com/wzj/soopin/transaction/domain/po/Divide.java | 11 ++++++----- .../soopin/transaction/domain/po/DivideDetail.java | 11 ++++++++--- .../wzj/soopin/transaction/domain/po/DivideRule.java | 11 ++++++----- .../transaction/domain/po/DivideRuleDetail.java | 11 ++++++++--- .../resources/mapper/transaction/DivideMapper.xml | 2 ++ 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java index e9da2d720..8b217b453 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java @@ -2,12 +2,12 @@ package com.wzj.soopin.transaction.domain.po; import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; +import org.apache.ibatis.type.JdbcType; +import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.math.BigDecimal; @@ -22,7 +22,7 @@ import java.math.BigDecimal; @Data @Builder(toBuilder = true) @TableName("trans_divide") -public class Divide extends BaseEntity { +public class Divide extends BaseAudit { /** * 主键 @@ -91,7 +91,8 @@ public class Divide extends BaseEntity { @ExcelProperty(value = "订单编号", order = 9) private String orderSn; - @TableLogic + @TableLogic(value = "0", delval = "1") + @TableField(value = "del_flag", fill = FieldFill.INSERT, jdbcType = JdbcType.CHAR) private String delFlag; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideDetail.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideDetail.java index 4ef49fe76..43161517f 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideDetail.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideDetail.java @@ -2,12 +2,13 @@ package com.wzj.soopin.transaction.domain.po; import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.ibatis.type.JdbcType; +import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.math.BigDecimal; @@ -23,7 +24,7 @@ import java.math.BigDecimal; @Data @TableName("trans_divide_detail") @Builder(toBuilder = true) -public class DivideDetail extends BaseEntity { +public class DivideDetail extends BaseAudit { /** * 主键 @@ -119,4 +120,8 @@ public class DivideDetail extends BaseEntity { private String orderSn; + @TableLogic(value = "0", delval = "1") + @TableField(value = "del_flag", fill = FieldFill.INSERT, jdbcType = JdbcType.CHAR) + private String delFlag; + } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java index 569206e58..2765831d4 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java @@ -2,12 +2,12 @@ package com.wzj.soopin.transaction.domain.po; import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.wzj.soopin.transaction.enums.DivideRuleFeeType; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.apache.ibatis.type.JdbcType; +import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.mybatis.core.domain.BaseEntity; /** @@ -19,7 +19,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; @Schema(description="分账规则") @Data @TableName("trans_divide_rule") -public class DivideRule extends BaseEntity { +public class DivideRule extends BaseAudit { /** * 主键 @@ -68,7 +68,8 @@ public class DivideRule extends BaseEntity { @ExcelProperty(value ="类型", order = 8) private Integer type; - @TableLogic + @TableLogic(value = "0", delval = "1") + @TableField(value = "del_flag", fill = FieldFill.INSERT, jdbcType = JdbcType.CHAR) private String delFlag; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRuleDetail.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRuleDetail.java index 182c2711b..503df6263 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRuleDetail.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRuleDetail.java @@ -2,10 +2,11 @@ package com.wzj.soopin.transaction.domain.po; import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.apache.ibatis.type.JdbcType; +import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.math.BigDecimal; @@ -19,7 +20,7 @@ import java.math.BigDecimal; @Schema(description="分账规则明细") @Data @TableName("trans_divide_rule_detail") -public class DivideRuleDetail extends BaseEntity { +public class DivideRuleDetail extends BaseAudit { /** * 主键 @@ -51,5 +52,9 @@ public class DivideRuleDetail extends BaseEntity { @ExcelProperty(value ="类型", order = 8) private Integer type; + @TableLogic(value = "0", delval = "1") + @TableField(value = "del_flag", fill = FieldFill.INSERT, jdbcType = JdbcType.CHAR) + private String delFlag; + } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/transaction/DivideMapper.xml b/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/transaction/DivideMapper.xml index bd7faabce..45b59de2d 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/transaction/DivideMapper.xml +++ b/ruoyi-modules/ruoyi-transaction/src/main/resources/mapper/transaction/DivideMapper.xml @@ -25,5 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" trans_divide_rule dr ON d.rule_id = dr.id WHERE d.id = #{divideId} + and d.del_flag = '0' and dr.del_flag = '0' +