get is_full_discount

FrankKangJun · FrankKangJun · commit 51b4a04cd4a3 · 2015-08-20T14:42:59.000+08:00
diff --git a/src/main/java/com/changyu/foryou/mapping/FoodMapper.xml b/src/main/java/com/changyu/foryou/mapping/FoodMapper.xml
@@ -15,6 +15,7 @@
 		<result column="prime_cost" property="primeCost" jdbcType="REAL" />	
 		<result column="to_home" property="toHome" jdbcType="SMALLINT"/>
 		<result column="home_image" property="homeImage" jdbcType="VARCHAR"/>	
+		<result column="is_full_discount" property="isFullDiscount" jdbcType="VARCHAR"/>	
 	</resultMap>
 	
 	<resultMap type="com.changyu.foryou.model.ShortFoodWithIm" id="SmallWithImResultMap"
@@ -71,7 +72,13 @@
 
 	<select id="selectByPrimaryKey" resultMap="BaseResultMap">
 		select
-		<include refid="Base_Column_List" />
+			food_id,campus_id, name, price, discount_price, grade,
+		img_url, info,
+		modify_time,
+		status,
+		food_flag, tag, is_discount,
+		category_id,
+		prime_cost, sale_number,food_count,food.message as message,to_home,home_image,is_full_discount
 		from food
 		where food_id = #{foodId,jdbcType=BIGINT}
 		and
diff --git a/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml b/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml
@@ -31,6 +31,7 @@
 		<result column="food_id" property="foodId" jdbcType="BIGINT" />
 		<result column="img_url" property="imageUrl" jdbcType="VARCHAR" />
 		<result column="is_discount" property="isDiscount" jdbcType="SMALLINT" />
+		<result column="is_full_discount" property="isFullDiscount" jdbcType="TINYINT" />
 	</resultMap>
 
 	<!-- 配送员配送界面model -->
@@ -82,6 +83,7 @@
 		<result column="pay_way" property="payWay" jdbcType="SMALLINT" />
 		<result column="campus_id" property="campusId" jdbcType="INTEGER" />
 		<result column="total_price" property="totalPrice" jdbcType="REAL" />
+		<result column="is_full_discount" property="isFullDiscount" jdbcType="TINYINT" />
 	</resultMap>
 
 	<!-- 超级管理员管理派单model -->
@@ -304,7 +306,7 @@
 		tag,img_url,food.status as status,
 		orders.order_count as order_count
 		,food.is_discount as is_discount,
-		food.price as price,food.name as name,discount_price
+		food.price as price,food.name as name,discount_price,is_full_discount
 		from orders,food
 		where
 		orders.food_id=food.food_id and orders.campus_id = food.campus_id and phone =
@@ -836,7 +838,7 @@
 		is_discount,
 		food.price as
 		price,food.name as name,
-		discount_price,food.message as message
+		discount_price,food.message as message,is_full_discount
 		from
 		orders,food
 		where
diff --git a/src/main/java/com/changyu/foryou/model/CartGood.java b/src/main/java/com/changyu/foryou/model/CartGood.java
@@ -18,6 +18,8 @@ public class CartGood {
     private Integer orderCount;
 
     private Short tag;
+    
+    private Short isFullDiscount;
 
     //private Integer foodSpecial;
 
@@ -27,8 +29,7 @@ public class CartGood {
     
     //private String specialName;
     
-    private Integer foodCount;
-    
+    private Integer foodCount;    
    
 	
 	public Long getOrderId() {
@@ -144,6 +145,14 @@ public void setFoodCount(Integer foodCount) {
 		this.foodCount = foodCount;
 	}
 
+	public Short getIsFullDiscount() {
+		return isFullDiscount;
+	}
+
+	public void setIsFullDiscount(Short isFullDiscount) {
+		this.isFullDiscount = isFullDiscount;
+	}
+
 	
     
     
diff --git a/src/main/java/com/changyu/foryou/model/Food.java b/src/main/java/com/changyu/foryou/model/Food.java
@@ -48,7 +48,14 @@ public class Food {
 	
 	private String message;
 	
+	private Short isFullDiscount;	
 	
+	public Short getIsFullDiscount() {
+		return isFullDiscount;
+	}
+	public void setIsFullDiscount(Short isFullDiscount) {
+		this.isFullDiscount = isFullDiscount;
+	}
 	public Food(){
 		
 	}
diff --git a/src/main/java/com/changyu/foryou/model/SmallOrder.java b/src/main/java/com/changyu/foryou/model/SmallOrder.java
@@ -44,6 +44,8 @@ public class SmallOrder {
 	
 	private Float totalPrice;
 	
+	private Short isFullDiscount;
+	
 	public Float getTotalPrice() {
 		return totalPrice;
 	}
@@ -213,5 +215,13 @@ public Short getPayWay() {
 	public void setPayWay(Short payWay) {
 		this.payWay = payWay;
 	}
+
+	public Short getIsFullDiscount() {
+		return isFullDiscount;
+	}
+
+	public void setIsFullDiscount(Short isFullDiscount) {
+		this.isFullDiscount = isFullDiscount;
+	}
   
 }
diff --git a/src/test/java/com/changyu/test/userTest.java b/src/test/java/com/changyu/test/userTest.java

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ public class SmallOrder {`
`44`	`44`
`45`	`45`	`private Float totalPrice;`
`46`	`46`
	`47`	`+ private Short isFullDiscount;`
	`48`	`+`
`47`	`49`	`public Float getTotalPrice() {`
`48`	`50`	`return totalPrice;`
`49`	`51`	`}`
`@@ -213,5 +215,13 @@ public Short getPayWay() {`
`213`	`215`	`public void setPayWay(Short payWay) {`
`214`	`216`	`this.payWay = payWay;`
`215`	`217`	`}`
	`218`	`+`
	`219`	`+ public Short getIsFullDiscount() {`
	`220`	`+ return isFullDiscount;`
	`221`	`+ }`
	`222`	`+`
	`223`	`+ public void setIsFullDiscount(Short isFullDiscount) {`
	`224`	`+ this.isFullDiscount = isFullDiscount;`
	`225`	`+ }`
`216`	`226`
`217`	`227`	`}`