新增

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/WalletAgentBalanceController.java

@@ -0,0 +1,15 @@
+package com.sckw.payment.controller;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Tag(name = "代理账户余额")
+@RestController
+@RequestMapping("/walletAgent/balance")
+public class WalletAgentBalanceController {
+
+
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/WalletAgentController.java

@@ -0,0 +1,15 @@
+package com.sckw.payment.controller;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Tag(name = "代理账户")
+@RestController
+@RequestMapping("/walletAgent")
+public class WalletAgentController {
+
+
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/WalletAgentRecordController.java

@@ -0,0 +1,15 @@
+package com.sckw.payment.controller;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Tag(name = "代理账户支付记录")
+@RestController
+@RequestMapping("/walletAgent/record")
+public class WalletAgentRecordController {
+
+
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/WalletPayableController.java

@@ -98,7 +98,7 @@ public class WalletPayableController  {
         } else {
             return BaseResult.success(Collections.emptyList());
         }
-        return remoteContractService.queryPrepaidTradeEntIds(queryFeignDto);
+        return BaseResult.success(remoteContractService.queryPrepaidTradeEntIds(queryFeignDto));
     }
 
 

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

@@ -0,0 +1,106 @@
+package com.sckw.payment.entity;
+
+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 io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+/**
+* @date 2026-06-15 10:58:32
+* @author xucaiqin
+*/
+/**
+ * 代理费
+ */
+@Schema(description="代理费")
+@Data
+@TableName(value = "wallet_agent")
+public class WalletAgent {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @Schema(description="id")
+    private Long id;
+
+    /**
+     * 代理商企业id
+     */
+    @TableField(value = "agt_ent_id")
+    @Schema(description="代理商企业id")
+    private Long agtEntId;
+
+    /**
+     * 供应商企业id
+     */
+    @TableField(value = "sup_ent_id")
+    @Schema(description="供应商企业id")
+    private Long supEntId;
+
+    /**
+     * 代理费金额
+     */
+    @TableField(value = "pre_balance")
+    @Schema(description="代理费金额")
+    private BigDecimal preBalance;
+
+    /**
+     * 交易中金额
+     */
+    @TableField(value = "trading_amount")
+    @Schema(description="交易中金额")
+    private BigDecimal tradingAmount;
+
+    /**
+     * 状态
+     */
+    @TableField(value = "`status`")
+    @Schema(description="状态")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @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

@@ -0,0 +1,141 @@
+package com.sckw.payment.entity;
+
+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 io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+/**
+* @date 2026-06-15 11:00:08
+* @author xucaiqin
+*/
+/**
+ * 代理余额明细
+ */
+@Schema(description="代理余额明细")
+@Data
+@TableName(value = "wallet_agent_balance")
+public class WalletAgentBalance {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @Schema(description="id")
+    private Long id;
+
+    /**
+     * 关联订单编号
+     */
+    @TableField(value = "order_no")
+    @Schema(description="关联订单编号")
+    private String orderNo;
+
+    /**
+     * 订单类型 2-预付订单  4-贸易订单
+     */
+    @TableField(value = "order_type")
+    @Schema(description="订单类型 2-预付订单  4-贸易订单")
+    private Integer orderType;
+
+    /**
+     * 代理商企业id
+     */
+    @TableField(value = "agt_ent_id")
+    @Schema(description="代理商企业id")
+    private Long agtEntId;
+
+    /**
+     * 供应商企业id
+     */
+    @TableField(value = "sup_ent_id")
+    @Schema(description="供应商企业id")
+    private Long supEntId;
+
+    /**
+     * 交易类型 1-消费 2-申请付款 3-付款成功 4-人工录入
+     */
+    @TableField(value = "trade_type")
+    @Schema(description="交易类型 1-消费 2-申请付款 3-付款成功 4-人工录入")
+    private Integer tradeType;
+
+    /**
+     * 交易金额
+     */
+    @TableField(value = "trade_amount")
+    @Schema(description="交易金额")
+    private BigDecimal tradeAmount;
+
+    /**
+     * 预付余额
+     */
+    @TableField(value = "pre_balance")
+    @Schema(description="预付余额")
+    private BigDecimal preBalance;
+
+    /**
+     * 交易中金额
+     */
+    @TableField(value = "trading_amount")
+    @Schema(description="交易中金额")
+    private BigDecimal tradingAmount;
+
+    /**
+     * 文件
+     */
+    @TableField(value = "`file`")
+    @Schema(description="文件")
+    private String file;
+
+    /**
+     * 执行状态，1-进行中 2-成功 3-失败
+     */
+    @TableField(value = "`status`")
+    @Schema(description="执行状态，1-进行中 2-成功 3-失败")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @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

@@ -0,0 +1,113 @@
+package com.sckw.payment.entity;
+
+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 io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+/**
+* @date 2026-06-15 11:00:08
+* @author xucaiqin
+*/
+/**
+ * 代理费支付记录
+ */
+@Schema(description="代理费支付记录")
+@Data
+@TableName(value = "wallet_agent_record")
+public class WalletAgentRecord {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @Schema(description="id")
+    private Long id;
+
+    /**
+     * 代理费id
+     */
+    @TableField(value = "agent_id")
+    @Schema(description="代理费id")
+    private Long agentId;
+
+    /**
+     * 支付订单号
+     */
+    @TableField(value = "order_no")
+    @Schema(description="支付订单号")
+    private String orderNo;
+
+    /**
+     * 支付金额
+     */
+    @TableField(value = "prepaid_amount")
+    @Schema(description="支付金额")
+    private BigDecimal prepaidAmount;
+
+    /**
+     * 到账金额
+     */
+    @TableField(value = "received_amount")
+    @Schema(description="到账金额")
+    private BigDecimal receivedAmount;
+
+    /**
+     * 响应
+     */
+    @TableField(value = "`data`")
+    @Schema(description="响应")
+    private String data;
+
+    /**
+     * 支付状态，0-等待支付，1-支付成功
+     */
+    @TableField(value = "`status`")
+    @Schema(description="支付状态，0-等待支付，1-支付成功")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @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/mapper/WalletAgentBalanceMapper.java

@@ -0,0 +1,13 @@
+package com.sckw.payment.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.payment.entity.WalletAgentBalance;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @date 2026-06-15 11:00:08
+* @author xucaiqin
+*/
+@Mapper
+public interface WalletAgentBalanceMapper extends BaseMapper<WalletAgentBalance> {
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletAgentMapper.java

@@ -0,0 +1,13 @@
+package com.sckw.payment.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.payment.entity.WalletAgent;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @date 2026-06-15 10:58:32
+* @author xucaiqin
+*/
+@Mapper
+public interface WalletAgentMapper extends BaseMapper<WalletAgent> {
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletAgentRecordMapper.java

@@ -0,0 +1,13 @@
+package com.sckw.payment.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.payment.entity.WalletAgentRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @date 2026-06-15 11:00:08
+* @author xucaiqin
+*/
+@Mapper
+public interface WalletAgentRecordMapper extends BaseMapper<WalletAgentRecord> {
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/pojo/vo/WalletVo.java

@@ -89,6 +89,11 @@ public class WalletVo {
     @Schema(description = "付款中金额")
     private BigDecimal payingAmount;
 
+    /**
+     * 代理费金额
+     */
+    @Schema(description = "代理费金额")
+    private BigDecimal agentAmount;
     /**
      * 渠道
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/pojo/vo/req/WalletPrepaidQuery.java

@@ -25,7 +25,7 @@ public class WalletPrepaidQuery extends BaseQuery {
     /** 待履约/预付余额最大值 */
     @Schema(description = "待履约/预付余额最大值 ")
     private BigDecimal balanceMax;
-    /** 企业类型 1供应商 2采购商 */
+    /** 企业类型 1供应商 2采购商 4-代理 */
     @Schema(hidden = true)
     private Integer entType;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/pojo/vo/res/WalletSummary.java

@@ -38,5 +38,7 @@ public class WalletSummary {
     @Schema(description = "付款中运费")
     private BigDecimal payingFreightTotal = BigDecimal.ZERO;
 
+    @Schema(description = "代理费金额")
+    private BigDecimal agentAmount = BigDecimal.ZERO;
 
 }

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

@@ -380,7 +380,7 @@ public class WalletService {
             bean.setFreightAmount(summary.getFreightTotal());
             bean.setProcessingAmount(summary.getTradingFreightTotal());
             bean.setPayingAmount(summary.getPayingFreightTotal());
-
+            bean.setAgentAmount(summary.getAgentAmount());
             return BaseResult.success(bean);
         }
         return BaseResult.failed("暂未开通钱包");

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

@@ -0,0 +1,16 @@
+package com.sckw.payment.service.impl;
+
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sckw.payment.mapper.WalletAgentBalanceMapper;
+import com.sckw.payment.entity.WalletAgentBalance;
+/**
+* @date 2026-06-15 11:00:08
+* @author xucaiqin
+*/
+@Service
+public class WalletAgentBalanceService extends ServiceImpl<WalletAgentBalanceMapper, WalletAgentBalance> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.sckw.payment.service.impl;
+
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sckw.payment.entity.WalletAgentRecord;
+import com.sckw.payment.mapper.WalletAgentRecordMapper;
+/**
+* @date 2026-06-15 11:00:08
+* @author xucaiqin
+*/
+@Service
+public class WalletAgentRecordService extends ServiceImpl<WalletAgentRecordMapper, WalletAgentRecord> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.sckw.payment.service.impl;
+
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sckw.payment.entity.WalletAgent;
+import com.sckw.payment.mapper.WalletAgentMapper;
+/**
+* @date 2026-06-15 10:58:32
+* @author xucaiqin
+*/
+@Service
+public class WalletAgentService extends ServiceImpl<WalletAgentMapper, WalletAgent> {
+
+}

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

@@ -637,12 +637,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         } else {
             return Collections.emptyList();
         }
-        BaseResult<List<TradeEntInfoResVo>> result = remoteContractService.queryPrepaidTradeEntIds(queryFeignDto);
-        if (result.getData() != null) {
-            return result.getData();
-        } else {
-            log.error("获取对方企业列表异常，错误信息：{}", result.getMessage());
-        }
-        return Collections.emptyList();
+
+        return remoteContractService.queryPrepaidTradeEntIds(queryFeignDto);
     }
 }

sckw-modules/sckw-payment/src/main/resources/mapper/WalletAgentBalanceMapper.xml

@@ -0,0 +1,31 @@
+<?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.sckw.payment.mapper.WalletAgentBalanceMapper">
+  <resultMap id="BaseResultMap" type="com.sckw.payment.entity.WalletAgentBalance">
+    <!--@mbg.generated-->
+    <!--@Table wallet_agent_balance-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="order_type" jdbcType="TINYINT" property="orderType" />
+    <result column="agt_ent_id" jdbcType="BIGINT" property="agtEntId" />
+    <result column="sup_ent_id" jdbcType="BIGINT" property="supEntId" />
+    <result column="trade_type" jdbcType="TINYINT" property="tradeType" />
+    <result column="trade_amount" jdbcType="DECIMAL" property="tradeAmount" />
+    <result column="pre_balance" jdbcType="DECIMAL" property="preBalance" />
+    <result column="trading_amount" jdbcType="DECIMAL" property="tradingAmount" />
+    <result column="file" jdbcType="VARCHAR" property="file" />
+    <result column="status" jdbcType="TINYINT" property="status" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="create_by" jdbcType="BIGINT" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="BIGINT" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="del_flag" jdbcType="TINYINT" property="delFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, order_no, order_type, agt_ent_id, sup_ent_id, trade_type, trade_amount, pre_balance, 
+    trading_amount, `file`, `status`, remark, create_by, create_time, update_by, update_time, 
+    del_flag
+  </sql>
+</mapper>

sckw-modules/sckw-payment/src/main/resources/mapper/WalletAgentMapper.xml

@@ -0,0 +1,25 @@
+<?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.sckw.payment.mapper.WalletAgentMapper">
+  <resultMap id="BaseResultMap" type="com.sckw.payment.entity.WalletAgent">
+    <!--@mbg.generated-->
+    <!--@Table wallet_agent-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="agt_ent_id" jdbcType="BIGINT" property="agtEntId" />
+    <result column="sup_ent_id" jdbcType="BIGINT" property="supEntId" />
+    <result column="pre_balance" jdbcType="DECIMAL" property="preBalance" />
+    <result column="trading_amount" jdbcType="DECIMAL" property="tradingAmount" />
+    <result column="status" jdbcType="TINYINT" property="status" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="create_by" jdbcType="BIGINT" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="BIGINT" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="del_flag" jdbcType="TINYINT" property="delFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, agt_ent_id, sup_ent_id, pre_balance, trading_amount, `status`, remark, create_by, 
+    create_time, update_by, update_time, del_flag
+  </sql>
+</mapper>

sckw-modules/sckw-payment/src/main/resources/mapper/WalletAgentRecordMapper.xml

@@ -0,0 +1,26 @@
+<?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.sckw.payment.mapper.WalletAgentRecordMapper">
+  <resultMap id="BaseResultMap" type="com.sckw.payment.entity.WalletAgentRecord">
+    <!--@mbg.generated-->
+    <!--@Table wallet_agent_record-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="agent_id" jdbcType="BIGINT" property="agentId" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="prepaid_amount" jdbcType="DECIMAL" property="prepaidAmount" />
+    <result column="received_amount" jdbcType="DECIMAL" property="receivedAmount" />
+    <result column="data" jdbcType="VARCHAR" property="data" />
+    <result column="status" jdbcType="TINYINT" property="status" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="create_by" jdbcType="BIGINT" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="BIGINT" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="del_flag" jdbcType="TINYINT" property="delFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, agent_id, order_no, prepaid_amount, received_amount, `data`, `status`, remark, 
+    create_by, create_time, update_by, update_time, del_flag
+  </sql>
+</mapper>