修改查询颜色功能

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/product/Product.java

@@ -48,7 +48,7 @@ public class Product implements java.io.Serializable{
 	
 	private String productRemark;			//产品备注
 	
-	private Integer productColor;			//产品颜色		1：红色	2：橙色	3：黄色	4：绿色
+	private String productColor;			//产品颜色		1：红色	2：橙色	3：黄色	4：绿色
 											//			5：青色	6：蓝色	7：紫色	8：白色
 	private ProductType productType;			//商品类型
 	
@@ -227,11 +227,11 @@ public class Product implements java.io.Serializable{
 		this.productRemark = productRemark;
 	}
 
-	public Integer getProductColor() {
+	public String getProductColor() {
 		return productColor;
 	}
 
-	public void setProductColor(Integer productColor) {
+	public void setProductColor(String productColor) {
 		this.productColor = productColor;
 	}
 

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/productInfoMapper.xml

@@ -11,11 +11,27 @@
 	
 	<!-- 分页查询商品信息 -->
 	<select id="selectPageProduct" parameterType="PaperBean" resultType="Product">
-		SELECT 
-			<include refid="product" />
+		SELECT
+		PRODUCT_ID productId,
+		PRODUCT_NAME productName,
+		PRODUCT_ABBREVIATION productAbbreviation,
+		color_discount productDiscount,
+		color_price productPrice,
+		PRODUCT_SALESNUM productSalesnum,
+		PRODUCT_ACCESSNUM productAccessnum,
+		PRODUCT_STATUS productStatus,
+		color_product_pic productIntroduceImg,
+		PRODUCT_PARAMETER_IMG productParameterImg,
+		PRODUCT_CREATE_DATE productCreateDate,
+		PRODUCT_SORT_NUM productSortNum,
+		PRODUCT_COLOR_DES productColorDes,
+		PRODUCT_REMARK productRemark,
+		color_name productColor
 		FROM 
-			TB_IAMBERRY_PRODUCT_INFO 
-		WHERE 
+			TB_IAMBERRY_PRODUCT_INFO
+		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR
+		on TB_IAMBERRY_PRODUCT_INFO.product_id = TB_IAMBERRY_PRODUCT_COLOR.color_product_id
+		WHERE
 			PRODUCT_STATUS = 1 
 			<if test="str != null and str != ''">
 				AND PRODUCT_NAME like #{str} 
@@ -40,11 +56,17 @@
 	<!-- 查询首页产品 -->
 	<select id="selectIndexPageProduct" resultType="Product">
 		SELECT 
-			PRODUCT_ID productId, PRODUCT_COLOR_DES productColorDes,
-			PRODUCT_DISCOUNT productDiscount, PRODUCT_INTRODUCE_IMG productIntroduceImg,
-			PRODUCT_NAME productName, PRODUCT_COLOR productColor, PRODUCT_PRICE productPrice
+			PRODUCT_ID productId,
+			PRODUCT_COLOR_DES productColorDes,
+			color_discount productDiscount,
+			color_product_pic productIntroduceImg,
+			PRODUCT_NAME productName,
+			color_name productColor,
+			color_price productPrice
 		FROM 
-			TB_IAMBERRY_PRODUCT_INFO 
+			TB_IAMBERRY_PRODUCT_INFO
+			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR
+		on TB_IAMBERRY_PRODUCT_INFO.product_id = TB_IAMBERRY_PRODUCT_COLOR.color_product_id
 		WHERE 
 			PRODUCT_STATUS = 1
 		LIMIT 

iamberry-wechat-web/src/main/webapp/WEB-INF/views/wechat/chanpin_list.html

@@ -61,8 +61,9 @@
 		<script src="http://static.iamberry.com/js/mui.min.js?v=2016101701"></script>
 		<script src="http://static.iamberry.com/js/jquery-2.1.1.min.js"></script>
 		<script src="http://static.iamberry.com/js/shop/main.js?v=2016101701"></script>
-		<script src="http://static.iamberry.com/js/shop/wechat-utils-1.0.js"></script>
+		<!--<script src="http://static.iamberry.com/js/shop/wechat-utils-1.0.js"></script>-->
 		<script src="http://static.iamberry.com/js/shop/validate.js?v=2016101701"></script>
-		<script src="http://static.iamberry.com/js/shop/chanpin_list.js?v=2016101701"></script>
+		<!--<script src="http://static.iamberry.com/js/shop/chanpin_list.js?v=2016101701"></script>-->
+		<script src="/iamberry/common/shop/js/page/chanpin_list.js?v=2016101701"></script>
 	</body>
 </html>

iamberry-wechat-web/src/main/webapp/WEB-INF/views/wechat/index.html

@@ -83,6 +83,7 @@
 		<script src="http://static.iamberry.com/js/jquery-2.1.1.min.js"></script>
 		<script src="http://static.iamberry.com/js/shop/main.js?v=2016101701"></script>
 		<script src="http://static.iamberry.com/js/shop/wechat-utils-1.0.js"></script>
-		<script src="http://static.iamberry.com/js/shop/index.js?v=2016101701"></script>
+		<!--<script src="http://static.iamberry.com/js/shop/index.js?v=2016101701"></script>-->
+		<script src="/iamberry/common/shop/js/page/index.js?v=2016101701"></script>
 	</body>
 </html>