From dc6abd25de0fc12e7a9de54f628f970c8fdc5910 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 22 May 2026 16:57:16 +0800
Subject: [PATCH] 理财

---
 trading-order-bean/src/main/java/com/yami/trading/bean/finance/FinanceOrder.java |   82 +++++++++++++++++++++++++---------------
 1 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/finance/FinanceOrder.java b/trading-order-bean/src/main/java/com/yami/trading/bean/finance/FinanceOrder.java
index 0703eb2..1700360 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/finance/FinanceOrder.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/finance/FinanceOrder.java
@@ -1,12 +1,12 @@
 package com.yami.trading.bean.finance;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yami.trading.common.domain.UUIDEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -14,43 +14,44 @@
  * @description: 理财订单
  * @create: 2025-01-22 16:45
  **/
+@Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("t_finance_order")
-@Data
-public class FinanceOrder {
+public class FinanceOrder extends UUIDEntity {
 
+    private static final long serialVersionUID = -726057340004619294L;
 
-    @TableId(type = IdType.AUTO,value = "id")
-    private int id;
+//	private String uuid;
 
     /**
      * 用户ID
      */
-    private int partyId;
+    private String partyId;
 
     /**
      * 订单 号
      */
-    private String order_no;
+    private String orderNo;
 
     /**
      * 理财产品名称
      */
-    private String financeName;
+    private String name;
 
     /**
      * 理财产品名称繁体
      */
-    private String financeName_cn;
+    private String nameCn;
 
     /**
      * 理财产品名称英文
      */
-    private String financeName_en;
+    private String nameEn;
 
     /**
      * 理财产品Id
      */
+    @TableField("`finance_id`")
     private String financeId;
 
     /**
@@ -61,89 +62,108 @@
     /**
      * 买入时间
      */
-    private Date create_time;
-
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
     /**
      * 起息时间 从买入时间第二天开始算
      */
-    private Date earn_time;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date earnTime;
 
     /**
      * 截止时间
      */
-    private Date stop_time;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date stopTime;
 
     /**
      * 赎回时间=截止时间+1天
      */
-    private Date close_time;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date closeTime;
 
     /**
      * 收益
      */
     private double profit;
-
     /**
      * 之前或累计收益
      */
-    private double profit_before;
+    private double profitBefore;
 
     /**
      * 状态。0.正常赎回, 1 托管中 ,2提前赎回 (违约)3.取消
      */
     private String state = "1";
-
     /**
      * 托管时间,周期
      */
     private int cycle;
 
     /**
-     * 理财产品图片
+     * 传回前端数据,数据库不保存
      */
-    private String img;
 
     /**
-     * 剩余天数
+     * 理财产品图片
      */
+    @TableField(exist = false)
+    private String img;
+    /**
+     * 剩余天数
+     *
+     * @return
+     */
+    @TableField(exist = false)
     private int days;
-
     /**
      * 赎回时间=截止时间+1天
      */
-    private String close_timeStr;
-
+    @TableField(exist = false)
+    private String closeTimeStr;
     /**
      * 买入时间
      */
-    private String create_timeStr;
+    @TableField(exist = false)
+    private String createTimeStr;
     /**
      * 起息时间 从买入时间第二天开始算
      */
-    private String earn_timeStr;
+    @TableField(exist = false)
+    private String earnTimeStr;
 
     /**
      * 截止时间
      */
-    private String stop_timeStr;
+    @TableField(exist = false)
+    private String stopTimeStr;
 
     /**
      * 日利率(%)
      */
-    private String daily_rate;
+    @TableField(exist = false)
+    private String dailyRate;
     /**
      * 预计收益
+     *
+     * @return
      */
-    private double profit_may;
+    @TableField(exist = false)
+    private double profitMay;
 
     /**
      * 理财购买币种
      */
+    //@TableField(exist = false)
     private String buyCurrency = "usdt";
 
+    //赎回币种数量
+    private double volume = 0;
+
     /**
      * 理财购买币种
      */
+    @TableField(exist = false)
     private String outputCurrency = "usdt";
 
 }

--
Gitblit v1.9.3