refactor(transaction): 重构分账模型领域对象

- 更新 Divide、DivideDetail、DivideRule 和 DivideRuleDetail 类
- 添加 delFlag 字段并配置为逻辑删除
- 修改 DivideMapper.xml 中的查询条件，增加逻辑删除判断- 继承 BaseAudit 以支持审计字段

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.*;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
 

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.*;
-import com.baomidou.mybatisplus.annotation.TableName;
 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;
+
 }

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.*;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
 

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.*;
-import com.baomidou.mybatisplus.annotation.TableName;
 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;
+
 
 }

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'
+
     </select>
 </mapper>