From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetailV2.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetailV2.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetailV2.java
index 99180a1..4e7ab55 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetailV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetailV2.java
@@ -1,16 +1,23 @@
package com.yeshi.fanli.entity.taobao.dataoke;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.index.Indexed;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field;
@Document(collection = "daTaoKeGoods")
-public class DaTaoKeDetailV2 {
+public class DaTaoKeDetailV2 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
@Id
private Long id;// 鍟嗗搧ID
+ @Indexed
@Field
private Long goodsId;// 娣樺疂鍟嗗搧ID
@Field
@@ -40,13 +47,14 @@
@Field
private String couponLink;// 棰嗗埜閾炬帴
@Field
- private Date couponEndTime;// 浼樻儬鍒哥粨鏉熸椂闂�
+ private String couponEndTime;// 浼樻儬鍒哥粨鏉熸椂闂�
@Field
- private Date couponStartTime;// 浼樻儬鍒稿紑濮嬫椂闂�
+ private String couponStartTime;// 浼樻儬鍒稿紑濮嬫椂闂�
@Field
private BigDecimal couponPrice;// 浼樻儬鍒搁噾棰�
@Field
private String couponConditions;// 浼樻儬鍒镐娇鐢ㄦ潯浠�
+ @Deprecated
@Field
private String couponId;// 鍒窱D
@Field
@@ -97,6 +105,17 @@
private Integer tbcid;// 鍟嗗搧鍦ㄦ窐瀹濈殑浜岀骇鍒嗙被id 锛岄潪澶ф窐瀹㈢殑浜岀骇鍒嗙被
@Field
private Date updateTime;
+ // 棰濆瀛楁缁存姢
+ @Field
+ private Integer commission;// 浣ｉ噾閲戦锛屽崟浣嶄负鍒�
+
+ public Integer getCommission() {
+ return commission;
+ }
+
+ public void setCommission(Integer commission) {
+ this.commission = commission;
+ }
public Date getUpdateTime() {
return updateTime;
@@ -226,19 +245,19 @@
this.couponLink = couponLink;
}
- public Date getCouponEndTime() {
+ public String getCouponEndTime() {
return couponEndTime;
}
- public void setCouponEndTime(Date couponEndTime) {
+ public void setCouponEndTime(String couponEndTime) {
this.couponEndTime = couponEndTime;
}
- public Date getCouponStartTime() {
+ public String getCouponStartTime() {
return couponStartTime;
}
- public void setCouponStartTime(Date couponStartTime) {
+ public void setCouponStartTime(String couponStartTime) {
this.couponStartTime = couponStartTime;
}
--
Gitblit v1.8.0