修改配置

iamberry-common-web/src/main/java/com/iamberry/common/web/SimpleCORSFilter.java

@@ -30,6 +30,7 @@ public class SimpleCORSFilter implements Filter {
 		origins.add("http://m.watero.cn");
 		origins.add("http://static.watero.cn");
 		origins.add("http://static.iamberry.com");
+		origins.add("http://test.iamberry.com:801");
 	}
 	
     public void init(FilterConfig filterConfig) throws ServletException {

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

@@ -25,7 +25,7 @@ PUBLIC
 		FROM
 			TB_IAMBERRY_SHOP_CART C
 			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR  pc on C.CART_PRODUCT_ID = pc.color_product_id and C.cart_color_id = pc.color_id
-			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR  pc on C.CART_PRODUCT_ID = pc.color_product_id
+			LEFT JOIN tb_iamberry_product_info p ON C.CART_PRODUCT_ID = p.product_id
 		WHERE
 			C.CART_OPENID = #{openId} 
 		ORDER BY C.CART_ID DESC