fix

sckw-modules/sckw-payment/deploy.sh

@@ -60,6 +60,9 @@ cd ${DEPLOY_DIR}
 docker compose up -d --build ${DOCKER_NAME}
 EOF
 
+echo "命令执行完毕，等待 2 秒..."
+sleep 2
+
 ssh ${REMOTE_HOST} << EOF
 docker logs --tail=40 ${DOCKER_NAME}
 EOF

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/WalletAgent.java

@@ -4,22 +4,23 @@ 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 java.math.BigDecimal;
-import java.time.LocalDateTime;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
 
 /**
+ * 代理费
 * @date 2026-06-15 10:58:32
 * @author xucaiqin
 */
-/**
- * 代理费
- */
 @Schema(description="代理费")
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName(value = "wallet_agent")
-public class WalletAgent {
+public class WalletAgent extends BaseEntity {
     /**
      * id
      */
@@ -68,39 +69,4 @@ public class WalletAgent {
     @TableField(value = "remark")
     @Schema(description="备注")
     private String remark;
-
-    /**
-     * 创建人id
-     */
-    @TableField(value = "create_by")
-    @Schema(description="创建人id")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    @Schema(description="创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_by")
-    @Schema(description="更新人id")
-    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;
-}
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/WalletAgentBalance.java

@@ -4,10 +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 java.math.BigDecimal;
-import java.time.LocalDateTime;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
 
 /**
 * @date 2026-06-15 11:00:08
@@ -18,8 +20,9 @@ import lombok.Data;
  */
 @Schema(description="代理余额明细")
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName(value = "wallet_agent_balance")
-public class WalletAgentBalance {
+public class WalletAgentBalance extends BaseEntity {
     /**
      * id
      */
@@ -103,39 +106,4 @@ public class WalletAgentBalance {
     @TableField(value = "remark")
     @Schema(description="备注")
     private String remark;
-
-    /**
-     * 创建人id
-     */
-    @TableField(value = "create_by")
-    @Schema(description="创建人id")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    @Schema(description="创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_by")
-    @Schema(description="更新人id")
-    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;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/WalletAgentRecord.java

@@ -4,22 +4,25 @@ 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 java.math.BigDecimal;
-import java.time.LocalDateTime;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
 
 /**
-* @date 2026-06-15 11:00:08
+* @date 2026-06-15 11:00:24
 * @author xucaiqin
 */
 /**
- * 代理费支付记录
+ * 代理支付记录
  */
-@Schema(description="代理费支付记录")
+@Schema(description="代理支付记录")
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName(value = "wallet_agent_record")
-public class WalletAgentRecord {
+public class WalletAgentRecord extends BaseEntity {
     /**
      * id
      */
@@ -28,24 +31,24 @@ public class WalletAgentRecord {
     private Long id;
 
     /**
-     * 代理费id
+     * 代理费订单id
      */
     @TableField(value = "agent_id")
-    @Schema(description="代理费id")
+    @Schema(description="代理费订单id")
     private Long agentId;
 
     /**
-     * 支付订单号
+     * 关联订单编号
      */
     @TableField(value = "order_no")
-    @Schema(description="支付订单号")
+    @Schema(description="关联订单编号")
     private String orderNo;
 
     /**
-     * 支付金额
+     * 预付金额
      */
     @TableField(value = "prepaid_amount")
-    @Schema(description="支付金额")
+    @Schema(description="预付金额")
     private BigDecimal prepaidAmount;
 
     /**
@@ -56,18 +59,18 @@ public class WalletAgentRecord {
     private BigDecimal receivedAmount;
 
     /**
-     * 响应
+     * 支付状态 0-待支付 1-已支付
      */
-    @TableField(value = "`data`")
-    @Schema(description="响应")
-    private String data;
+    @TableField(value = "`status`")
+    @Schema(description="支付状态 0-待支付 1-已支付")
+    private Integer status;
 
     /**
-     * 支付状态，0-等待支付，1-支付成功
+     * 数据
      */
-    @TableField(value = "`status`")
-    @Schema(description="支付状态，0-等待支付，1-支付成功")
-    private Integer status;
+    @TableField(value = "data")
+    @Schema(description="数据")
+    private String data;
 
     /**
      * 备注
@@ -75,39 +78,4 @@ public class WalletAgentRecord {
     @TableField(value = "remark")
     @Schema(description="备注")
     private String remark;
-
-    /**
-     * 创建人id
-     */
-    @TableField(value = "create_by")
-    @Schema(description="创建人id")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    @Schema(description="创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人id
-     */
-    @TableField(value = "update_by")
-    @Schema(description="更新人id")
-    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;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/WalletPayable.java

@@ -1,11 +1,14 @@
 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.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.util.Date;
 
 /**
  * 待付/代收运费清单(wallet_payable)
@@ -14,9 +17,12 @@ import java.util.Date;
  * @since  2026-01-06 10:28:02
  */
 @Data
-public class WalletPayable {
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "wallet_payable")
+public class WalletPayable extends BaseEntity {
 
 	/** 待付/代收运费清单主键id */
+    @TableId(value = "id", type = IdType.AUTO)
     @Schema(description = "待付/代收运费清单主键id")
     private Long id;
 	/** 托运企业id */
@@ -40,23 +46,6 @@ public class WalletPayable {
 	/** 备注 */
     @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;
 
     @Schema(description = "是否存在未完成申请付款记录，1-存在，0-不存在")
     private Integer existsApply;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/entity/WalletPrepaid.java

@@ -1,11 +1,14 @@
 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.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.util.Date;
 
 /**
  * 预付清单(wallet_prepaid)
@@ -14,9 +17,12 @@ import java.util.Date;
  * @since  2026-01-06 10:28:02
  */
 @Data
-public class WalletPrepaid {
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "wallet_prepaid")
+public class WalletPrepaid extends BaseEntity {
 
 	/** 预付清单主键id */
+    @TableId(value = "id", type = IdType.AUTO)
     @Schema(description = "预付清单主键id")
     private Long id;
 	/** 采购商企业id */
@@ -37,21 +43,4 @@ public class WalletPrepaid {
 	/** 备注 */
     @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;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/IWalletPrepaidService.java

@@ -10,7 +10,6 @@ import jakarta.servlet.http.HttpServletResponse;
 
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 预付清单Service接口
@@ -34,13 +33,6 @@ public interface IWalletPrepaidService {
      */
     PageInfo<WalletPrepaidRes> selectWalletPrepaidList(WalletPrepaidQuery query);
 
-    /**
-     * 查询预付清单
-     *
-     * @param id 预付清单主键id
-     * @return 预付清单
-     */
-    WalletPrepaid selectWalletPrepaidById(Long id);
 
     WalletPrepaid queryPrepaidBalance(Long supEntId);
 
@@ -52,45 +44,6 @@ public interface IWalletPrepaidService {
      */
     List<WalletPrepaid> selectWalletPrepaidByIds(List<Long> idList);
 
-    /**
-     * 根据主键ID列表查询预付清单集合
-     *
-     * @param idList 预付清单主键id列表
-     * @return Map<预付清单主键id, 预付清单>
-     */
-    Map<Long, WalletPrepaid> mapWalletPrepaidByIds(List<Long> idList);
-
-    /**
-     * 新增预付清单
-     *
-     * @param walletPrepaid 预付清单
-     * @return 结果数据
-     */
-    int insertWalletPrepaid(WalletPrepaid walletPrepaid);
-
-    /**
-     * 修改预付清单
-     *
-     * @param walletPrepaid 预付清单
-     * @return 结果数据
-     */
-    int updateWalletPrepaid(WalletPrepaid walletPrepaid);
-
-    /**
-     * 删除预付清单
-     *
-     * @param id 预付清单主键id
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidById(Long id);
-
-    /**
-     * 批量删除预付清单
-     *
-     * @param idList 预付清单主键id列表
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidByIds(List<Long> idList);
 
 
     WalletPrepaidSummary selectWalletPrepaidSummary(WalletPrepaidQuery query);

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/impl/WalletAgentService.java

@@ -440,14 +440,10 @@ public class WalletAgentService extends ServiceImpl<WalletAgentMapper, WalletAge
             return BaseResult.failed("金额不能大于待收代理费");
         }
 
-        Long userId = LoginUserHolder.getUserId();
-        LocalDateTime now = LocalDateTime.now();
         String orderNo = "M" + System.currentTimeMillis();
 
         BigDecimal newPre = walletAgent.getPreBalance().subtract(manualDto.getAmount());
         walletAgent.setPreBalance(newPre);
-        walletAgent.setUpdateBy(userId);
-        walletAgent.setUpdateTime(now);
         baseMapper.updateById(walletAgent);
 
         WalletAgentBalance balance = new WalletAgentBalance();
@@ -461,10 +457,6 @@ public class WalletAgentService extends ServiceImpl<WalletAgentMapper, WalletAge
         balance.setTradingAmount(walletAgent.getTradingAmount());
         balance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
         balance.setRemark(manualDto.getRemark());
-        balance.setCreateBy(userId);
-        balance.setCreateTime(now);
-        balance.setUpdateBy(userId);
-        balance.setUpdateTime(now);
         balance.setDelFlag(0);
         walletAgentBalanceMapper.insert(balance);
 
@@ -476,10 +468,6 @@ public class WalletAgentService extends ServiceImpl<WalletAgentMapper, WalletAge
         record.setStatus(PayStatusEnum.PAID.getCode());
         record.setData("");
         record.setRemark(manualDto.getRemark());
-        record.setCreateBy(userId);
-        record.setCreateTime(now);
-        record.setUpdateBy(userId);
-        record.setUpdateTime(now);
         record.setDelFlag(0);
         walletAgentRecordMapper.insert(record);
         return BaseResult.success();
@@ -522,9 +510,6 @@ public class WalletAgentService extends ServiceImpl<WalletAgentMapper, WalletAge
             throw new RuntimeException(e);
         }
 
-        Long userId = LoginUserHolder.getUserId();
-        LocalDateTime now = LocalDateTime.now();
-
         WalletAgentRecord record = new WalletAgentRecord();
         record.setAgentId(walletAgent.getId());
         record.setOrderNo(orderNo);
@@ -533,10 +518,6 @@ public class WalletAgentService extends ServiceImpl<WalletAgentMapper, WalletAge
         record.setStatus(PayStatusEnum.PAYABLE.getCode());
         record.setData(JSONObject.toJSONString(pay.getData()));
         record.setRemark(payDto.getRemark());
-        record.setCreateBy(userId);
-        record.setCreateTime(now);
-        record.setUpdateBy(userId);
-        record.setUpdateTime(now);
         record.setDelFlag(0);
         walletAgentRecordMapper.insert(record);
 
@@ -544,8 +525,6 @@ public class WalletAgentService extends ServiceImpl<WalletAgentMapper, WalletAge
         BigDecimal newTrading = (walletAgent.getTradingAmount() == null ? BigDecimal.ZERO : walletAgent.getTradingAmount()).add(payDto.getPayAmount());
         walletAgent.setPreBalance(newPre);
         walletAgent.setTradingAmount(newTrading);
-        walletAgent.setUpdateBy(userId);
-        walletAgent.setUpdateTime(now);
         baseMapper.updateById(walletAgent);
 
         WalletAgentBalance balance = new WalletAgentBalance();
@@ -559,10 +538,6 @@ public class WalletAgentService extends ServiceImpl<WalletAgentMapper, WalletAge
         balance.setTradingAmount(newTrading);
         balance.setStatus(ExecutionStatusEnum.IN_PROGRESS.getCode());
         balance.setRemark(payDto.getRemark());
-        balance.setCreateBy(userId);
-        balance.setCreateTime(now);
-        balance.setUpdateBy(userId);
-        balance.setUpdateTime(now);
         balance.setDelFlag(0);
         walletAgentBalanceMapper.insert(balance);
 

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

@@ -204,10 +204,6 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         return prepaidBalance;
     }
 
-    @Override
-    public WalletPrepaid selectWalletPrepaidById(Long id) {
-        return walletPrepaidMapper.selectWalletPrepaidById(id);
-    }
 
     @Override
     public List<WalletPrepaid> selectWalletPrepaidByIds(List<Long> idList) {
@@ -218,40 +214,6 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         return walletPrepaidMapper.selectWalletPrepaidByIds(idList);
     }
 
-    @Override
-    public Map<Long, WalletPrepaid> mapWalletPrepaidByIds(List<Long> idList) {
-        List<WalletPrepaid> list = selectWalletPrepaidByIds(idList);
-        return Optional.ofNullable(list).orElse(Collections.emptyList()).stream().collect(Collectors.toMap(WalletPrepaid::getId, WalletPrepaid -> WalletPrepaid));
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int insertWalletPrepaid(WalletPrepaid walletPrepaid) {
-        return walletPrepaidMapper.insertWalletPrepaid(walletPrepaid);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int updateWalletPrepaid(WalletPrepaid walletPrepaid) {
-        return walletPrepaidMapper.updateWalletPrepaid(walletPrepaid);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int deleteWalletPrepaidById(Long id) {
-        return walletPrepaidMapper.deleteWalletPrepaidById(id);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int deleteWalletPrepaidByIds(List<Long> idList) {
-        if (CollectionUtils.isEmpty(idList)) {
-            return 0;
-        }
-        return walletPrepaidMapper.deleteWalletPrepaidByIds(idList);
-    }
-
-
     @Override
     public WalletPrepaidSummary selectWalletPrepaidSummary(WalletPrepaidQuery query) {
         return walletPrepaidMapper.selectWalletPrepaidSummary(query);