From a053811c774ac07340e46561f5d2ab4d892282a0 Mon Sep 17 00:00:00 2001
From: Administrator <1101184511@qq.com>
Date: 星期一, 29 七月 2024 02:38:40 +0800
Subject: [PATCH] 渠道功能完善

---
 src/main/java/com/taoke/autopay/entity/agent/ChannelAgentSettleRecord.java |   51 ++++++++++++++++++++++++++++++++-------------------
 1 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/taoke/autopay/entity/agent/ChannelAgentSettleRecord.java b/src/main/java/com/taoke/autopay/entity/agent/ChannelAgentSettleRecord.java
index c0eb117..650fafa 100644
--- a/src/main/java/com/taoke/autopay/entity/agent/ChannelAgentSettleRecord.java
+++ b/src/main/java/com/taoke/autopay/entity/agent/ChannelAgentSettleRecord.java
@@ -1,12 +1,15 @@
 package com.taoke.autopay.entity.agent;
 
+import lombok.Builder;
 import lombok.Data;
+import lombok.experimental.Tolerate;
 import org.springframework.data.annotation.Id;
 import org.yeshi.utils.generater.mybatis.Column;
 import org.yeshi.utils.generater.mybatis.Table;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author hxh
@@ -14,8 +17,9 @@
  * @description: 娓犻亾缁撶畻璁板綍
  * @date 2024/7/20 22:06
  */
+@Builder
 @Data
-@Table(value="table_agent_settle_record")
+@Table(value = "table_agent_settle_record")
 public class ChannelAgentSettleRecord {
     // 鏈粨绠楋細缁撶畻杩樻湭鏍¢獙
     public final static int STATUS_NOT_SETTLE = 0;
@@ -24,76 +28,85 @@
     // 鎻愮幇瀹℃牳涓�
     public final static int STATUS_WITHDRAWING = 2;
     // 鎻愮幇鎴愬姛
-    public final static int STATUS_WITHDRAW_SUCCESS= 3;
+    public final static int STATUS_WITHDRAW_SUCCESS = 3;
     // 鎻愮幇琚┏鍥�
-    public final static int STATUS_WITHDRAW_REJECTED= 4;
+    public final static int STATUS_WITHDRAW_REJECTED = 4;
+
+    @Tolerate
+    public ChannelAgentSettleRecord() {
+
+    }
 
 
     @Id
-    @Column(name="_id")
+    @Column(name = "_id")
     private Long id;
     /**
      * 浠g悊鐢ㄦ埛ID
      */
-    @Column(name="_agent_id")
+    @Column(name = "_agent_id")
     private Long agentId;
     /**
      * 缁撶畻鏃ユ湡
      */
-    @Column(name="_settle_day")
+    @Column(name = "_settle_day")
     private String settleDay;
     /**
      * 缁撶畻閲戦
      */
-    @Column(name="_settle_money")
+    @Column(name = "_settle_money")
     private BigDecimal settleMoney;
     /**
      * 瀹為檯缁撶畻閲戦
      */
-    @Column(name="_actual_settle_money")
+    @Column(name = "_actual_settle_money")
     private BigDecimal actualSettleMoney;
 
     /**
      * 鏀粯鏃堕棿
      */
-    @Column(name="_pay_time")
+    @Column(name = "_pay_time")
     private Date payTime;
 
-    @Column(name="_status")
+    @Column(name = "_status")
     private Integer status;
 
-    @Column(name="_status_desc")
-    private Integer statusDesc;
+    @Column(name = "_status_desc")
+    private String statusDesc;
 
     /**
      * 缁撶畻鏃堕棿
      */
-    @Column(name="_settle_time")
+    @Column(name = "_settle_time")
     private Date settleTime;
 
     /**
      * 鎻愮幇鐢宠鏃堕棿
      */
-    @Column(name="_withdraw_apply_time")
+    @Column(name = "_withdraw_apply_time")
     private Date withDrawApplyTime;
 
     /**
      * 鎻愮幇澶勭悊鏃堕棿
      */
-    @Column(name="_withdraw_process_time")
+    @Column(name = "_withdraw_process_time")
     private Date withDrawProcessTime;
 
-    @Column(name="_alipay_name")
+    @Column(name = "_alipay_name")
     private String alipayName;
 
-    @Column(name="_alipay_account")
+    @Column(name = "_alipay_account")
     private String alipayAccount;
 
 
-    @Column(name="_create_time")
+    @Column(name = "_create_time")
     private Date createTime;
-    @Column(name="_update_time")
+    @Column(name = "_update_time")
     private Date updateTime;
 
+    private ChannelAgent agent;
+
+    private List<ChannelAgentSettleDetail> detailList;
+
 
 }

--
Gitblit v1.8.0