From 595b7935a30e84fba1bc3561d05f9d19d3e32e1f Mon Sep 17 00:00:00 2001
From: Administrator <1101184511@qq.com>
Date: 星期三, 23 四月 2025 00:45:48 +0800
Subject: [PATCH] 后台管理页面完成

---
 src/main/java/com/taoke/autopay/entity/KeyOrder.java |  134 ++++++++------------------------------------
 1 files changed, 26 insertions(+), 108 deletions(-)

diff --git a/src/main/java/com/taoke/autopay/entity/KeyOrder.java b/src/main/java/com/taoke/autopay/entity/KeyOrder.java
index b041105..715d06d 100644
--- a/src/main/java/com/taoke/autopay/entity/KeyOrder.java
+++ b/src/main/java/com/taoke/autopay/entity/KeyOrder.java
@@ -1,9 +1,11 @@
 package com.taoke.autopay.entity;
 
+import lombok.Data;
 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;
 
 /**
@@ -12,6 +14,7 @@
  * @description: TODO
  * @date 2024/6/14 18:58
  */
+@Data
 @Table("table_order")
 public class KeyOrder {
     // 灏氭湭澶勭悊
@@ -20,7 +23,7 @@
     public final static int STATE_NOT_PAY = 1;
     // 宸叉敮浠�
     public final static int STATE_PAY = 2;
-    // 宸叉敮浠�
+    // 宸叉嫆缁�
     public final static int STATE_REJECT_PAY = 3;
 
 
@@ -39,6 +42,8 @@
     private Integer orderState;
     @Column(name = "state")
     private Integer state;
+    @Column(name = "sub_state")
+    private Integer subState;
     @Column(name = "state_desc")
     private String stateDesc;
     @Column(name = "distribute_client_uid")
@@ -53,116 +58,29 @@
     private Date excutePayTime;
     @Column(name = "pay_time")
     private Date payTime;
+    @Column(name = "order_money")
+    private BigDecimal orderMoney;
+    @Column(name = "order_channel")
+    private String orderChannel;
+    @Column(name = "pay_type")
+    private Integer payType;
+    /**
+     * 浠g悊ID
+     **/
+    @Column(name = "agent_id")
+    private Long agentId;
 
-    public String getId() {
-        return id;
-    }
+    @Column(name = "pay_merchant")
+    private String payMerchant;
 
-    public void setId(String id) {
-        this.id = id;
-    }
+    @Column(name = "ip")
+    private String ip;
 
-    public String getKey() {
-        return key;
-    }
+    @Column(name = "ip_info")
+    private String ipInfo;
 
-    public void setKey(String key) {
-        this.key = key;
-    }
+    @Column(name = "ignore")
+    private Boolean ignore;
 
-    public Integer getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(Integer orderType) {
-        this.orderType = orderType;
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public Integer getOrderState() {
-        return orderState;
-    }
-
-    public void setOrderState(Integer orderState) {
-        this.orderState = orderState;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getStateDesc() {
-        return stateDesc;
-    }
-
-    public void setStateDesc(String stateDesc) {
-        this.stateDesc = stateDesc;
-    }
-
-    public Long getDistributeClientUid() {
-        return distributeClientUid;
-    }
-
-    public void setDistributeClientUid(Long distributeClientUid) {
-        this.distributeClientUid = distributeClientUid;
-    }
-
-    public Date getDistributeTime() {
-        return distributeTime;
-    }
-
-    public void setDistributeTime(Date distributeTime) {
-        this.distributeTime = distributeTime;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Long getUid() {
-        return uid;
-    }
-
-    public void setUid(Long uid) {
-        this.uid = uid;
-    }
-
-    public Date getExcutePayTime() {
-        return excutePayTime;
-    }
-
-    public void setExcutePayTime(Date excutePayTime) {
-        this.excutePayTime = excutePayTime;
-    }
-
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
+    private WxUserInfo user;
 }

--
Gitblit v1.8.0