From 8a66d7d040d10d03c32062ae7bb7e1fad836871f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 09 四月 2021 19:00:51 +0800
Subject: [PATCH] dubbo集成，订单优化

---
 src/main/java/com/yeshi/buwan/domain/vip/VIPOrderRecord.java |   82 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/domain/vip/VIPOrderRecord.java b/src/main/java/com/yeshi/buwan/domain/vip/VIPOrderRecord.java
index ce956e3..1ef36e4 100644
--- a/src/main/java/com/yeshi/buwan/domain/vip/VIPOrderRecord.java
+++ b/src/main/java/com/yeshi/buwan/domain/vip/VIPOrderRecord.java
@@ -12,6 +12,8 @@
     //宸叉敮浠�
     public final static int STATE_PAY = 1;
 
+    //璁㈠崟宸插彇娑�
+    public final static int STATE_CANCEL = -1;
 
     //鏀粯瀹�
     public final static int PAY_WAY_ALIPAY = 1;
@@ -19,14 +21,39 @@
     //寰俊
     public final static int PAY_WAY_WX = 2;
 
+    //褰辫璞嗘敮浠�
+    public final static int PAY_WAY_GOLDCORN = 3;
+
+    //鏀粯瀹�+褰辫璞�
+    public final static int PAY_WAY_ALIPAY_GOLDCORN = 13;
+
+    //寰俊+褰辫璞�
+    public final static int PAY_WAY_WX_GOLDCORN = 23;
+
+    //璁㈠崟绫诲瀷
+    private OrderType orderType;
 
     private String id;
     //鐢ㄦ埛ID
     private String uid;
     //鐘舵��
     private Integer state;
+
+    //璧勯噾鏀粯鐘舵��
+    private Boolean moneyPay;
+
+    //璧勯噾鏀粯鐘舵��
+    private Boolean goldCornPay;
+
+    //褰辫璞�
+    private Integer goldCorn;
+
+    //鍗曠墖ID
+    private String videoInfoId;
+
     //绫诲瀷
     private VIPPriceType type;
+
     //璧勯噾
     private BigDecimal money;
     //鏀粯鏂瑰紡
@@ -40,14 +67,30 @@
     private Date payTime;
     private Date createTime;
     private Date updateTime;
-
-
-
     //浼氬憳寮�濮嬫椂闂�
     private Date vipStartTime;
     //浼氬憳缁撴潫鏃堕棿
     private Date vipEndTime;
 
+    //澶囨敞
+    private String remarks;
+
+
+    public Boolean getMoneyPay() {
+        return moneyPay;
+    }
+
+    public void setMoneyPay(Boolean moneyPay) {
+        this.moneyPay = moneyPay;
+    }
+
+    public Boolean getGoldCornPay() {
+        return goldCornPay;
+    }
+
+    public void setGoldCornPay(Boolean goldCornPay) {
+        this.goldCornPay = goldCornPay;
+    }
 
     public Date getVipStartTime() {
         return vipStartTime;
@@ -153,4 +196,37 @@
     public void setIpInfo(String ipInfo) {
         this.ipInfo = ipInfo;
     }
+
+    public Integer getGoldCorn() {
+        return goldCorn;
+    }
+
+    public void setGoldCorn(Integer goldCorn) {
+        this.goldCorn = goldCorn;
+    }
+
+    public String getVideoInfoId() {
+        return videoInfoId;
+    }
+
+    public void setVideoInfoId(String videoInfoId) {
+        this.videoInfoId = videoInfoId;
+    }
+
+
+    public OrderType getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(OrderType orderType) {
+        this.orderType = orderType;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
 }

--
Gitblit v1.8.0