zoujiajian 1 سال پیش
والد
کامیت
e70b64892a

+ 8 - 1
netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonSkuFrontView.java

@@ -8,6 +8,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /*
@@ -88,7 +89,7 @@ public class GoodsDonSkuFrontView {
 	/**
 	 * 价格
 	 */
-	private BigDecimal price;
+	private BigDecimal price = BigDecimal.ZERO;
 
 	/**
 	 * 优惠价格
@@ -108,6 +109,12 @@ public class GoodsDonSkuFrontView {
 	@DbIgnore
 	private BigDecimal reduceMoney;
 
+	/**
+	 * 优惠券有效结束时间
+	 */
+	@DbIgnore
+	private Date validEndTime;
+
 	/**
 	 * 专属用户规格
 	 */

+ 8 - 1
netflix-dao/src/main/java/com/cyksj/model/views/GoodsFrontListCategoryView.java

@@ -9,6 +9,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -74,7 +75,7 @@ public class GoodsFrontListCategoryView {
 	 * 最低规格价格
 	 */
 	@DbField("g.min_price")
-	private BigDecimal price;
+	private BigDecimal price = BigDecimal.ZERO;;
 
 	/**
 	 * 优惠价格
@@ -94,6 +95,12 @@ public class GoodsFrontListCategoryView {
 	@DbIgnore
 	private BigDecimal reduceMoney;
 
+	/**
+	 * 优惠券有效结束时间
+	 */
+	@DbIgnore
+	private Date validEndTime;
+
 	/**
 	 * 最低规格月份
 	 */

+ 8 - 1
netflix-dao/src/main/java/com/cyksj/model/views/HomeManagementFrontView.java

@@ -12,6 +12,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /*
@@ -111,6 +112,12 @@ public class HomeManagementFrontView {
 	@DbIgnore
 	private BigDecimal reduceMoney;
 
+	/**
+	 * 优惠券有效结束时间
+	 */
+	@DbIgnore
+	private Date validEndTime;
+
 	/**
 	 * 类型
 	 */
@@ -127,7 +134,7 @@ public class HomeManagementFrontView {
 	 * 最低规格价格
 	 */
 	@DbField("g.min_price")
-	private BigDecimal price;
+	private BigDecimal price = BigDecimal.ZERO;;
 
 	/**
 	 * 最低规格月份

+ 3 - 0
netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -1380,6 +1380,7 @@ public class GoodsDonController {
 				data.setDiscount(coupon.getDiscount());
 				data.setReduceMoney(coupon.getReduceMoney());
 				data.setDiscountPrice(data.getPrice().subtract(coupon.getCouponMoney()));
+				data.setValidEndTime(coupon.getValidEndTime());
 			}
 		}
 	}
@@ -1396,6 +1397,7 @@ public class GoodsDonController {
 				sku.setDiscount(coupon.getDiscount());
 				sku.setReduceMoney(coupon.getReduceMoney());
 				sku.setDiscountPrice(sku.getPrice().subtract(coupon.getCouponMoney()));
+				sku.setValidEndTime(coupon.getValidEndTime());
 			}
 		}
 	}
@@ -1412,6 +1414,7 @@ public class GoodsDonController {
 				data.setDiscount(coupon.getDiscount());
 				data.setReduceMoney(coupon.getReduceMoney());
 				data.setDiscountPrice(data.getPrice().subtract(coupon.getCouponMoney()));
+				data.setValidEndTime(coupon.getValidEndTime());
 			}
 		}
 	}