From c16b9ffceac828840ef7ebc4827612d17906704a Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 19 Mar 2021 19:56:29 +0800
Subject: [PATCH] 积分商城9

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrderDetails.java |   59 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrderDetails.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrderDetails.java
index 0fbad67..073eb07 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrderDetails.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrderDetails.java
@@ -1,7 +1,7 @@
 package com.matrix.system.shopXcx.bean;
 
-import com.matrix.core.pojo.EntityDTO;
 import com.matrix.core.anotations.Extend;
+import com.matrix.core.pojo.EntityDTO;
 
 import java.math.BigDecimal;
 
@@ -10,6 +10,7 @@
  * @author jyy
  * @date 2019-06-10 10:58
  */
+
 public class ShopOrderDetails  extends EntityDTO{
 	@Extend
 	private static final long serialVersionUID = 1L;
@@ -51,7 +52,22 @@
 	 * 单价
 	 */
 	private BigDecimal price;
-			
+
+	/**
+	 * 总价
+	 */
+	private BigDecimal  totalPrice;
+
+	/**
+	 * 支付积分单价
+	 */
+	private BigDecimal scoreCount;
+
+	/**
+	 * 支付总积分
+	 */
+	private BigDecimal totalScoreCount;
+
 	
 	/**
 	 * 数量
@@ -62,12 +78,7 @@
 	 */
 	private Integer  payType;
 
-	
-	/**
-	 * 总价
-	 */
-	private BigDecimal  totalPrice;
-			
+
 	
 	/**
 	 * 规格标题
@@ -144,12 +155,28 @@
 		this.price = price;
 	}
 
-	public Integer getPayType() {
-		return payType;
+	public BigDecimal getTotalPrice() {
+		return totalPrice;
 	}
 
-	public void setPayType(Integer payType) {
-		this.payType = payType;
+	public void setTotalPrice(BigDecimal totalPrice) {
+		this.totalPrice = totalPrice;
+	}
+
+	public BigDecimal getScoreCount() {
+		return scoreCount;
+	}
+
+	public void setScoreCount(BigDecimal scoreCount) {
+		this.scoreCount = scoreCount;
+	}
+
+	public BigDecimal getTotalScoreCount() {
+		return totalScoreCount;
+	}
+
+	public void setTotalScoreCount(BigDecimal totalScoreCount) {
+		this.totalScoreCount = totalScoreCount;
 	}
 
 	public Integer getCount() {
@@ -160,12 +187,12 @@
 		this.count = count;
 	}
 
-	public BigDecimal getTotalPrice() {
-		return totalPrice;
+	public Integer getPayType() {
+		return payType;
 	}
 
-	public void setTotalPrice(BigDecimal totalPrice) {
-		this.totalPrice = totalPrice;
+	public void setPayType(Integer payType) {
+		this.payType = payType;
 	}
 
 	public String getsTitle() {

--
Gitblit v1.9.1