老用户感恩回馈活动

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

@@ -45,6 +45,8 @@ public class CartDto implements Serializable{
 	
 	private String productColor;			//产品颜色
 
+	private String productColorDes;			//产品颜色
+
 	
 	public String getProductColor() {
 		return productColor;
@@ -166,6 +168,13 @@ public class CartDto implements Serializable{
 	public void setProductIntroduceImg(String productIntroduceImg) {
 		this.productIntroduceImg = productIntroduceImg;
 	}
-	
-	
+
+
+	public String getProductColorDes() {
+		return productColorDes;
+	}
+
+	public void setProductColorDes(String productColorDes) {
+		this.productColorDes = productColorDes;
+	}
 }

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

@@ -236,7 +236,7 @@ PUBLIC
 			C.CART_ID cartId, G.PRODUCT_ID cartProductId, pc.COLOR_ID cartColorId, G.PRODUCT_STATUS productStatus, 
 			C.CART_NUM cartNum, G.PRODUCT_NAME productName, pc.COLOR_DISCOUNT productPrice, 
 			G.PRODUCT_INTRODUCE_IMG productIntroduceImg, pc.COLOR_PRICE productDiscount, PC.COLOR_69CODE productRemark, 
-			pc.COLOR_NAME productColor, G.PRODUCT_TYPE productType 
+			pc.COLOR_NAME productColor, G.PRODUCT_TYPE productType ,G.product_color_des
 		FROM 
 			TB_IAMBERRY_SHOP_CART C 
 		LEFT JOIN TB_IAMBERRY_PRODUCT_INFO G ON C.CART_PRODUCT_ID = G.PRODUCT_ID