From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java
index 611b1a4..1936178 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java
@@ -6,7 +6,6 @@
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
-import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserInfo;
/**
@@ -21,8 +20,10 @@
private Long id;
@Column(name = "sgao_uid")
private UserInfo user;
- @Column(name = "sgao_order_id")
- private Order order;// 璁㈠崟
+ @Column(name = "sgao_order_no")
+ private String orderNo;// 璁㈠崟鍙�
+ @Column(name = "sgao_order_source_type")
+ private Integer orderSourceType;// 璁㈠崟鍙�
@Column(name = "sgao_share_rate")
private BigDecimal shareRate;// 鍒嗕韩姣斾緥
@Column(name = "sgao_create_time")
@@ -38,20 +39,28 @@
this.id = id;
}
+ public String getOrderNo() {
+ return orderNo;
+ }
+
+ public void setOrderNo(String orderNo) {
+ this.orderNo = orderNo;
+ }
+
+ public Integer getOrderSourceType() {
+ return orderSourceType;
+ }
+
+ public void setOrderSourceType(Integer orderSourceType) {
+ this.orderSourceType = orderSourceType;
+ }
+
public UserInfo getUser() {
return user;
}
public void setUser(UserInfo user) {
this.user = user;
- }
-
- public Order getOrder() {
- return order;
- }
-
- public void setOrder(Order order) {
- this.order = order;
}
public BigDecimal getShareRate() {
--
Gitblit v1.8.0