修改查询颜色功能

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/CartDto.java

@@ -22,13 +22,13 @@ public class CartDto implements Serializable{
 	private Integer cartProductId;		//商品id
 	
 	private Integer cartNum;				//商品数量
-	
+
 	private Date cartCreateDate;		//时间
-	
+
 	private String productName;		//商品名称
-	
+
 	private Integer productType;		//商品类型id
-	
+
 	private Integer productPrice;		//商品原价
 	
 	private Integer productStatus;		//商品状态
@@ -41,7 +41,7 @@ public class CartDto implements Serializable{
 	
 	private String productRemark; //商品备注
 	
-	private Integer productColor;			//产品颜色		1：红色	2：橙色	3：黄色	4：绿色 5：青色	6：蓝色	7：紫色	8：白色
+	private String productColor;			//产品颜色		不再用代码表示，直接使用汉字- 1：红色	2：橙色	3：黄色	4：绿色 5：青色	6：蓝色	7：紫色	8：白色
 	
 
 	
@@ -53,11 +53,11 @@ public class CartDto implements Serializable{
 		this.productType = productType;
 	}
 
-	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/cartMapper.xml

@@ -10,11 +10,13 @@ PUBLIC
 	<!-- 查询用户购物车所有信息 -->
 	<select id="selectCartByOpenId" parameterType="String" resultType="CartDto">
 		SELECT 
-			C.CART_ID cartId, C.CART_PRODUCT_ID cartProductId, C.CART_NUM cartNum,P.PRODUCT_NAME productName, 
-			P.PRODUCT_DISCOUNT productPrice, P.PRODUCT_STATUS productStatus, P.PRODUCT_COLOR productColor, 
-			P.PRODUCT_INTRODUCE_IMG productIntroduceImg, PRODUCT_REMARK productRemark 
+			C.CART_ID cartId, C.CART_PRODUCT_ID cartProductId, C.CART_NUM cartNum,P.PRODUCT_NAME productName,
+			pc.color_discount productPrice, P.PRODUCT_STATUS productStatus, pc.color_name productColor,
+			pc.color_product_pic productIntroduceImg, PRODUCT_REMARK productRemark
 		FROM 
-			TB_IAMBERRY_SHOP_CART C LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P ON C.CART_PRODUCT_ID = P.PRODUCT_ID
+			TB_IAMBERRY_SHOP_CART C
+			LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P ON C.CART_PRODUCT_ID = P.PRODUCT_ID
+			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR  pc on C.CART_PRODUCT_ID = pc.color_product_id
 		WHERE
 			C.CART_OPENID = #{openId} 
 		ORDER BY C.CART_ID DESC 

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

@@ -76,19 +76,51 @@
 	<!-- 根据productId查询商品信息 -->
 	<select id="getProductByProductId" parameterType="java.lang.Integer" resultType="Product">
 		SELECT 
-			<include refid="product" />
+			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 
+			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_ID = #{productId}
 	</select>
 	
 	<!-- 根据商品名称查询商品信息 -->
 	<select id="getProductByProductName" parameterType="java.lang.String" 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 
+			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>
 			<if test="_parameter != null">
 				PRODUCT_NAME like #{productName} 

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

@@ -95,7 +95,8 @@
 		<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/shopping_cart.js?v=2016101701"></script>
+<!--		<script src="http://static.iamberry.com/js/shop/shopping_cart.js?v=2016101701"></script>-->
+		<script src="/iamberry/common/shop/js/page/shopping_cart.js?v=2016101701"></script>
 	</body>
 
 </html>

iamberry-wechat-web/src/main/webapp/common/shop/js/page/index.js

@@ -28,7 +28,8 @@ console.log(dian);
 				var pro_data = dt.data.products;
 				mui(pro_data).each(function(index) {
 					var img_str = "";
-					var pro_color = switchcolor(this.productColor)
+					/*var pro_color = switchcolor(this.productColor)*/
+					var pro_color = this.productColor;
 
 					if(index == 0) {
 						img_str = '<img val="' + this.productIntroduceImg + '"  src="' + this.productIntroduceImg + '">';

iamberry-wechat-web/src/main/webapp/common/shop/js/page/shopping_cart.js

@@ -121,7 +121,8 @@ function selectCart() {
 					var sumCount = 0;
 					var pro_color="";
 					for (var i = 0; i < dt.data.cartList.length; i++) {
-					    pro_color=switchcolor(dt.data.cartList[i].productColor)
+					    /*pro_color=switchcolor(dt.data.cartList[i].productColor)*/
+                        pro_color= dt.data.cartList[i].productColor;
 						if (dt.data.cartList[i].productStatus != 1) {
 							noteLi += "<li class='mui-table-view-cell mui-media bg-f'>" + 
 										"<div class='mui-slider-right mui-disabled'><a class='mui-btn mui-btn-red btn-del' onclick='deleteCartItem(this, 1)' lang='" + dt.data.cartList[i].cartProductId + "'>删除</a></div><div class='mui-slider-handle'><img class='mui-media-object mui-pull-left wh-100' src='" + dt.data.cartList[i].productIntroduceImg + "'>" +