Merge branch 'dev_order' into test6.8.2

 package com.yohoufo.product.model;
 package com.yohoufo.product.model;
 
 
+import java.math.BigDecimal;
+
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.annotation.JSONField;
 
 
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
 /**
 /**
  * 商品尺寸信息VO
  * 商品尺寸信息VO
  * @author xieyong
  * @author xieyong
@@ -46,6 +44,12 @@ public class GoodsSize {
 
 
 	@JSONField(name="max_price")
 	@JSONField(name="max_price")
 	private BigDecimal maxPrice;
 	private BigDecimal maxPrice;
+	
+	@JSONField(name="suggest_low_price")
+	private BigDecimal suggestLowPrice;
+	
+	@JSONField(name="suggest_high_price")
+	private BigDecimal suggestHighPrice;
 
 
 	public BigDecimal getSellLeastPrice() {
 	public BigDecimal getSellLeastPrice() {
 		return sellLeastPrice;
 		return sellLeastPrice;
@@ -127,6 +131,22 @@ public class GoodsSize {
 		this.maxPrice = maxPrice;
 		this.maxPrice = maxPrice;
 	}
 	}
 
 
+	public BigDecimal getSuggestLowPrice() {
+		return suggestLowPrice;
+	}
+
+	public void setSuggestLowPrice(BigDecimal suggestLowPrice) {
+		this.suggestLowPrice = suggestLowPrice;
+	}
+
+	public BigDecimal getSuggestHighPrice() {
+		return suggestHighPrice;
+	}
+
+	public void setSuggestHighPrice(BigDecimal suggestHighPrice) {
+		this.suggestHighPrice = suggestHighPrice;
+	}
+
 	@Override
 	@Override
 	public String toString() {
 	public String toString() {
 		return JSONObject.toJSONString(this);
 		return JSONObject.toJSONString(this);

@@ -589,6 +589,8 @@ public class ProductServiceImpl implements ProductService{
 					goodsSize.setSkup(storagePrice == null ? 0 : storagePrice.getSkup());
 					goodsSize.setSkup(storagePrice == null ? 0 : storagePrice.getSkup());
 					goodsSize.setSellLeastPrice(sellMinPrice);
 					goodsSize.setSellLeastPrice(sellMinPrice);
 					goodsSize.setMaxPrice(maxPrice);
 					goodsSize.setMaxPrice(maxPrice);
+					goodsSize.setSuggestLowPrice(storage.getSuggestLowPrice());
+					goodsSize.setSuggestHighPrice(storage.getSuggestHighPrice());
 					goodSizeList.add(goodsSize);
 					goodSizeList.add(goodsSize);
 				}
 				}
 			}
 			}