xucaiqin 1 zi în urmă
părinte
comite
2ac4f9bb10

+ 22 - 18
sckw-common/sckw-common-core/src/main/java/com/sckw/core/config/MyMetaObjectHandler.java

@@ -1,12 +1,14 @@
 package com.sckw.core.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.sckw.core.model.base.BaseEntity;
 import com.sckw.core.web.context.LoginUserHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 /**
  * MybatisPlus 自动填充处理器
@@ -19,21 +21,21 @@ import java.time.LocalDateTime;
 @Component
 public class MyMetaObjectHandler implements MetaObjectHandler {
 
-    private static final String CREATE_BY = "createBy";
-    private static final String CREATE_TIME = "createTime";
-    private static final String UPDATE_BY = "updateBy";
-    private static final String UPDATE_TIME = "updateTime";
-    private static final Long DEFAULT_USER_ID = 1L;
-
     @Override
     public void insertFill(MetaObject metaObject) {
         log.debug("开始插入自动填充...");
         Long userId = getUserId();
         LocalDateTime now = LocalDateTime.now();
-        this.strictInsertFill(metaObject, CREATE_BY, Long.class, userId);
-        this.strictInsertFill(metaObject, CREATE_TIME, LocalDateTime.class, now);
-        this.strictInsertFill(metaObject, UPDATE_BY, Long.class, userId);
-        this.strictInsertFill(metaObject, UPDATE_TIME, LocalDateTime.class, now);
+        if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) {
+            if (Objects.isNull(baseEntity.getCreateBy())) {
+                baseEntity.setCreateBy(userId);
+            }
+
+            if (Objects.isNull(baseEntity.getCreateTime())) {
+                baseEntity.setCreateTime(now);
+            }
+        }
+
     }
 
     @Override
@@ -41,16 +43,18 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
         log.debug("开始更新自动填充...");
         Long userId = getUserId();
         LocalDateTime now = LocalDateTime.now();
-        this.strictUpdateFill(metaObject, UPDATE_BY, Long.class, userId);
-        this.strictUpdateFill(metaObject, UPDATE_TIME, LocalDateTime.class, now);
+        if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) {
+            if (Objects.isNull(baseEntity.getUpdateBy())) {
+                baseEntity.setUpdateBy(userId);
+            }
+
+            if (Objects.isNull(baseEntity.getUpdateTime())) {
+                baseEntity.setUpdateTime(now);
+            }
+        }
     }
 
     private Long getUserId() {
-        try {
-            return LoginUserHolder.getUserId();
-        } catch (Exception e) {
-            log.warn("获取当前登录用户失败,使用默认用户ID 1", e);
-            return DEFAULT_USER_ID;
-        }
+        return LoginUserHolder.getUserId();
     }
 }

+ 7 - 0
sckw-common/sckw-common-core/src/main/java/com/sckw/core/config/MybatisPlusConfig.java

@@ -1,6 +1,7 @@
 package com.sckw.core.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.springframework.context.annotation.Bean;
@@ -32,5 +33,11 @@ public class MybatisPlusConfig {
         mybatisPlusInterceptor.setInterceptors(Collections.singletonList(paginationInnerInterceptor()));
         return mybatisPlusInterceptor;
     }
+
+
+    @Bean
+    public MetaObjectHandler defaultMetaObjectHandler() {
+        return new MyMetaObjectHandler();
+    }
 }
 

+ 4 - 36
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/KwpWallet.java

@@ -4,11 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * 钱包表
@@ -16,10 +17,11 @@ import java.time.LocalDateTime;
  * @author xucaiqin
  * @date 2026-03-26 14:33:23
  */
+@EqualsAndHashCode(callSuper = true)
 @Schema(description = "钱包表")
 @Data
 @TableName(value = "kwp_wallet")
-public class KwpWallet {
+public class KwpWallet extends BaseEntity {
     /**
      * 主键
      */
@@ -115,38 +117,4 @@ public class KwpWallet {
     @Schema(description = "备注")
     private String remark;
 
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    @Schema(description = "创建人")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    @Schema(description = "更新人")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    @Schema(description = "0-正常 1-删除")
-    private Integer delFlag;
 }

+ 4 - 36
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/KwpWalletCash.java

@@ -4,11 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * 提现记录表
@@ -16,10 +17,11 @@ import java.time.LocalDateTime;
  * @author xucaiqin
  * @date 2026-03-26 14:32:05
  */
+@EqualsAndHashCode(callSuper = true)
 @Schema(description = "提现记录表")
 @Data
 @TableName(value = "kwp_wallet_cash")
-public class KwpWalletCash {
+public class KwpWalletCash extends BaseEntity {
     /**
      * 主键
      */
@@ -90,38 +92,4 @@ public class KwpWalletCash {
     @Schema(description = "状态")
     private Integer status;
 
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    @Schema(description = "创建人")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    @Schema(description = "更新人")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    @Schema(description = "0-正常 1-删除")
-    private Integer delFlag;
 }

+ 4 - 35
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/KwpWalletSplit.java

@@ -4,11 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * 清分表
@@ -16,10 +17,11 @@ import java.time.LocalDateTime;
  * @author xucaiqin
  * @date 2026-04-08 11:25:38
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Schema(description = "清分表")
 @TableName(value = "kwp_wallet_split")
-public class KwpWalletSplit {
+public class KwpWalletSplit extends BaseEntity {
     /**
      * 主键
      */
@@ -86,39 +88,6 @@ public class KwpWalletSplit {
     @Schema(description = "状态 1-已提交 2-清分成功 3-清分失败")
     private Integer status;
 
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    @Schema(description = "创建人")
-    private Long createBy;
 
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    @Schema(description = "更新人")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    @Schema(description = "0-正常 1-删除")
-    private Integer delFlag;
 
 }

+ 5 - 21
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/WalletBusinessFile.java

@@ -1,10 +1,9 @@
 package com.sckw.payment.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-
-import java.util.Date;
+import lombok.EqualsAndHashCode;
 
 /**
  * 钱包_业务文件(wallet_business_file)
@@ -12,8 +11,9 @@ import java.util.Date;
  * @author tangys
  * @since  2026-01-12 14:11:22
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class WalletBusinessFile {
+public class WalletBusinessFile extends BaseEntity {
 
 	/** 主键 */
     @Schema(description = "主键")
@@ -30,21 +30,5 @@ public class WalletBusinessFile {
 	/** 状态:0正常/1锁定 */
     @Schema(description = "状态:0正常/1锁定")
     private Integer status;
-	/** 删除标识(0正常/1删除) */
-    @Schema(description = "删除标识(0正常/1删除)")
-    private Integer delFlag;
-	/** 创建人 */
-    @Schema(description = "创建人")
-    private Long createBy;
-	/** 创建时间 */
-    @Schema(description = "创建时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-	/** 更新人 */
-    @Schema(description = "更新人")
-    private Long updateBy;
-	/** 更新时间 */
-    @Schema(description = "更新时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+
 }

+ 8 - 20
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/WalletPayableApply.java

@@ -1,11 +1,13 @@
 package com.sckw.payment.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.sckw.core.model.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 运费付款申请记录(wallet_freight_apply)
@@ -13,11 +15,13 @@ import java.util.Date;
  * @author tangys
  * @since  2026-01-19 16:13:22
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class WalletPayableApply {
+public class WalletPayableApply extends BaseEntity {
 
 	/** 运费付款申请记录主键id */
     @Schema(description = "运费付款申请记录主键id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 	/** 待付/代收运费清单id */
     @Schema(description = "待付/代收运费清单id")
@@ -40,21 +44,5 @@ public class WalletPayableApply {
 	/** 备注 */
     @Schema(description = "备注")
     private String remark;
-	/** 删除标记 0-未删除 1-已删除 */
-    @Schema(description = "删除标记 0-未删除 1-已删除")
-    private Integer delFlag;
-	/** 创建人id */
-    @Schema(description = "创建人id")
-    private Long createBy;
-	/** 创建时间 */
-    @Schema(description = "创建时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-	/** 更新人id */
-    @Schema(description = "更新人id")
-    private Long updateBy;
-	/** 更新时间 */
-    @Schema(description = "更新时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+
 }

+ 8 - 20
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/WalletPayableBalance.java

@@ -1,11 +1,13 @@
 package com.sckw.payment.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.sckw.core.model.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 待付/代收运费余额明细(wallet_payable_balance)
@@ -13,11 +15,13 @@ import java.util.Date;
  * @author tangys
  * @since  2026-01-12 16:24:22
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class WalletPayableBalance {
+public class WalletPayableBalance extends BaseEntity {
 
 	/** 待付/代收运费余额明细主键id */
     @Schema(description = "待付/代收运费余额明细主键id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 	/** 关联订单编号 */
     @Schema(description = "关联订单编号")
@@ -55,21 +59,5 @@ public class WalletPayableBalance {
 	/** 凭证标识 0-无凭证 1-有凭证 */
     @Schema(description = "凭证标识 0-无凭证 1-有凭证")
     private Integer voucherFlag;
-	/** 删除标记 0-未删除 1-已删除 */
-    @Schema(description = "删除标记 0-未删除 1-已删除")
-    private Integer delFlag;
-	/** 创建人id */
-    @Schema(description = "创建人id")
-    private Long createBy;
-	/** 创建时间 */
-    @Schema(description = "创建时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-	/** 更新人id */
-    @Schema(description = "更新人id")
-    private Long updateBy;
-	/** 更新时间 */
-    @Schema(description = "更新时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+
 }

+ 5 - 20
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/WalletPayablePay.java

@@ -1,11 +1,11 @@
 package com.sckw.payment.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 运费支付记录(wallet_freight_record)
@@ -13,8 +13,9 @@ import java.util.Date;
  * @author tangys
  * @since  2026-01-15 09:32:47
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class WalletPayablePay {
+public class WalletPayablePay extends BaseEntity {
 
 	/** 运费支付记录主键id */
     @Schema(description = "运费支付记录主键id")
@@ -42,21 +43,5 @@ public class WalletPayablePay {
 	/** 备注 */
     @Schema(description = "备注")
     private String remark;
-	/** 删除标记 0-未删除 1-已删除 */
-    @Schema(description = "删除标记 0-未删除 1-已删除")
-    private Integer delFlag;
-	/** 创建人id */
-    @Schema(description = "创建人id")
-    private Long createBy;
-	/** 创建时间 */
-    @Schema(description = "创建时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-	/** 更新人id */
-    @Schema(description = "更新人id")
-    private Long updateBy;
-	/** 更新时间 */
-    @Schema(description = "更新时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+
 }

+ 5 - 20
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/WalletPrepaidBalance.java

@@ -1,11 +1,11 @@
 package com.sckw.payment.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 采购企业预付余额明细(wallet_prepaid_balance)
@@ -13,8 +13,9 @@ import java.util.Date;
  * @author tangys
  * @since  2026-01-12 16:24:22
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class WalletPrepaidBalance {
+public class WalletPrepaidBalance extends BaseEntity {
 
 	/** 预付余额明细主键id */
     @Schema(description = "预付余额明细主键id")
@@ -52,21 +53,5 @@ public class WalletPrepaidBalance {
 	/** 凭证标识 0-无凭证 1-有凭证 */
     @Schema(description = "凭证标识 0-无凭证 1-有凭证")
     private Integer voucherFlag;
-	/** 删除标记 0-未删除 1-已删除 */
-    @Schema(description = "删除标记 0-未删除 1-已删除")
-    private Integer delFlag;
-	/** 创建人id */
-    @Schema(description = "创建人id")
-    private Long createBy;
-	/** 创建时间 */
-    @Schema(description = "创建时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-	/** 更新人id */
-    @Schema(description = "更新人id")
-    private Long updateBy;
-	/** 更新时间 */
-    @Schema(description = "更新时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+
 }

+ 5 - 20
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/WalletPrepaidRecord.java

@@ -1,11 +1,11 @@
 package com.sckw.payment.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 预付支付记录(wallet_prepaid_record)
@@ -13,8 +13,9 @@ import java.util.Date;
  * @author tangys
  * @since  2026-01-15 09:32:47
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class WalletPrepaidRecord {
+public class WalletPrepaidRecord extends BaseEntity {
 
 	/** 预付支付记录主键id */
     @Schema(description = "预付支付记录主键id")
@@ -38,21 +39,5 @@ public class WalletPrepaidRecord {
 	/** 备注 */
     @Schema(description = "备注")
     private String remark;
-	/** 删除标记 0-未删除 1-已删除 */
-    @Schema(description = "删除标记 0-未删除 1-已删除")
-    private Integer delFlag;
-	/** 创建人id */
-    @Schema(description = "创建人id")
-    private Long createBy;
-	/** 创建时间 */
-    @Schema(description = "创建时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-	/** 更新人id */
-    @Schema(description = "更新人id")
-    private Long updateBy;
-	/** 更新时间 */
-    @Schema(description = "更新时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+
 }

+ 0 - 22
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/impl/WalletPayableServiceImpl.java

@@ -134,8 +134,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
                 WalletBusinessFile file = new WalletBusinessFile();
                 file.setBusinessId(payableBalance.getId());
                 file.setFilePath(e);
-                file.setCreateBy(LoginUserHolder.getUserId());
-                file.setCreateTime(new Date());
                 list.add(file);
             });
             businessFileMapper.insertBatch(list);
@@ -166,8 +164,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
                 payable.setCarrierEntId(LoginUserHolder.getEntId());
                 payable.setFreight(payableManualDto.getTradeAmount());
                 payable.setTradingFreight(BigDecimal.ZERO);
-                payable.setCreateBy(LoginUserHolder.getUserId());
-                payable.setCreateTime(new Date());
                 payable.setPayingFreight(BigDecimal.ZERO);
                 result = walletPayableMapper.insertWalletPayable(payable);
             }
@@ -189,8 +185,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
         payableBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
         payableBalance.setRemark(payableManualDto.getRemark());
         payableBalance.setVoucherFlag(CollectionUtils.isEmpty(payableManualDto.getVoucherFiles()) ? 0 : 1);
-        payableBalance.setCreateBy(LoginUserHolder.getUserId());
-        payableBalance.setCreateTime(new Date());
         return payableBalance;
     }
 
@@ -206,8 +200,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
             payable.setCarrierEntId(payableAddDto.getCarriageEntId());
             payable.setFreight(payableAddDto.getTradeAmount());
             payable.setTradingFreight(payableAddDto.getTradeAmount());
-            payable.setCreateTime(new Date());
-            payable.setCreateBy(LoginUserHolder.getUserId());
             payable.setPayingFreight(payableAddDto.getTradeAmount());
             result = walletPayableMapper.insertWalletPayable(payable);
         }
@@ -270,8 +262,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
         payableBalance.setPayingFreight(payable.getPayingFreight());
         payableBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
         payableBalance.setRemark(payableAddDto.getRemark());
-        payableBalance.setCreateBy(LoginUserHolder.getUserId());
-        payableBalance.setCreateTime(new Date());
         return payableBalance;
     }
 
@@ -312,8 +302,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
         payableBalance.setFreight(payable.getFreight());
         payableBalance.setPayingFreight(payable.getPayingFreight());
         payableBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
-        payableBalance.setCreateBy(LoginUserHolder.getUserId());
-        payableBalance.setCreateTime(new Date());
         payableBalance.setRemark(freightApply.getRemark());
         return payableBalance;
     }
@@ -324,8 +312,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
         apply.setOrderNo(IdUtil.getSnowflakeNextIdStr());
         apply.setApplyAmount(applyPayDto.getApplyAmount());
         apply.setRemark(applyPayDto.getRemark());
-        apply.setCreateBy(LoginUserHolder.getUserId());
-        apply.setCreateTime(new Date());
         return apply;
     }
 
@@ -420,8 +406,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
         payablePay.setOrderNo(IdUtil.getSnowflakeNextIdStr());
         payablePay.setApplyAmount(payableApply.getApplyAmount().subtract(payableApply.getPayingAmount().add(payableApply.getReceivedAmount())));
         payablePay.setReceivedAmount(BigDecimal.ZERO);
-        payablePay.setCreateBy(LoginUserHolder.getUserId());
-        payablePay.setCreateTime(new Date());
         return payablePay;
     }
 
@@ -486,10 +470,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
             walletBusinessFile.setRemark("");
             walletBusinessFile.setStatus(0);
             walletBusinessFile.setDelFlag(0);
-            walletBusinessFile.setCreateBy(LoginUserHolder.getUserId());
-            walletBusinessFile.setCreateTime(new Date());
-            walletBusinessFile.setUpdateBy(LoginUserHolder.getUserId());
-            walletBusinessFile.setUpdateTime(new Date());
             MultipartFile file = receivedCallbackDto.getFile();
             BaseResult<FileInfoVO> httpResult = remoteFileService.fileUpload(file);
             if (HttpStatus.SUCCESS_CODE == httpResult.getCode()) {
@@ -528,8 +508,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
         payableBalance.setFreight(payable.getFreight());
         payableBalance.setTradingFreight(payable.getTradingFreight());
         payableBalance.setPayingFreight(payable.getPayingFreight());
-        payableBalance.setCreateTime(new Date());
-        payableBalance.setCreateBy(LoginUserHolder.getUserId());
         payableBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
         return payableBalance;
     }

+ 0 - 12
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/impl/WalletPrepaidServiceImpl.java

@@ -199,8 +199,6 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         prepaidBalance.setRemark(manualEntryDto.getRemark());
         prepaidBalance.setVoucherFlag(CollectionUtils.isEmpty(manualEntryDto.getVoucherFiles()) ? 0 : 1);
         prepaidBalance.setDelFlag(0);
-        prepaidBalance.setCreateBy(LoginUserHolder.getUserId());
-        prepaidBalance.setCreateTime(new Date());
         return prepaidBalance;
     }
 
@@ -284,8 +282,6 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         BeanUtils.copyProperties(prepaidAddDto, prepaidRecord);
         prepaidRecord.setOrderNo(payReq.getOrderNo());
         prepaidRecord.setData(JSONObject.toJSONString(pay.getData()));
-        prepaidRecord.setCreateBy(LoginUserHolder.getUserId());
-        prepaidRecord.setCreateTime(new Date());
         walletPrepaidRecordMapper.insertWalletPrepaidRecord(prepaidRecord);
         WalletPayAddRes walletPayAddRes = new WalletPayAddRes();
         PayRes data = pay.getData();
@@ -373,10 +369,6 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
             walletBusinessFile.setRemark("");
             walletBusinessFile.setStatus(0);
             walletBusinessFile.setDelFlag(0);
-            walletBusinessFile.setCreateBy(LoginUserHolder.getUserId());
-            walletBusinessFile.setCreateTime(new Date());
-            walletBusinessFile.setUpdateBy(LoginUserHolder.getUserId());
-            walletBusinessFile.setUpdateTime(new Date());
             MultipartFile file = receivedCallbackDto.getFile();
             BaseResult<FileInfoVO> httpResult = remoteFileService.fileUpload(file);
             if (HttpStatus.SUCCESS_CODE == httpResult.getCode()) {
@@ -485,8 +477,6 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         prepaidBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
         prepaidBalance.setRemark(prepaidDto.getRemark());
         prepaidBalance.setVoucherFlag(0);
-        prepaidBalance.setCreateBy(LoginUserHolder.getUserId());
-        prepaidBalance.setCreateTime(new Date());
         return prepaidBalance;
     }
 
@@ -501,8 +491,6 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         prepaidBalance.setPreBalance(walletPrepaid.getPreBalance());
         prepaidBalance.setTradingAmount(walletPrepaid.getTradingAmount());
         prepaidBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
-        prepaidBalance.setCreateBy(LoginUserHolder.getUserId());
-        prepaidBalance.setCreateTime(new Date());
         return prepaidBalance;
     }