Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

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

@@ -44,6 +44,7 @@ public class SimpleCORSFilter implements Filter {
 			response.setHeader("Access-Control-Allow-Origin", requestOrigin);
 			response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
 			response.setHeader("Access-Control-Max-Age", "3600");
+			response.setHeader("Access-Control-Allow-Credentials", "true");
 			response.setHeader("Access-Control-Allow-Headers", "x-requested-with");
         }
         filterChain.doFilter(servletRequest, servletResponse);

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/cart/CartService.java

@@ -31,6 +31,9 @@ public interface CartService {
 
 	//根据商品id和用户openid查询购物车是否有该商品
 	public CartDto getCartByCartProductId(CartDto cartDto);
+
+	/*获取购物车信息*/
+	public CartDto getCartDto(CartDto cartDto);
 	
 	//添加商品到购物车
 	public Integer addProductToCart(CartDto cartDto);

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/CartServiceImpl.java

@@ -79,6 +79,12 @@ public class CartServiceImpl implements CartService {
 	}
 
 	@Override
+	public CartDto getCartDto(CartDto cartDto) {
+		// TODO Auto-generated method stub
+		return cartDao.getCartDto(cartDto);
+	}
+
+	@Override
 	public Integer addProductToCart(CartDto cartDto) {
 		// TODO Auto-generated method stub
 		Integer num = cartDao.addProductToCart(cartDto);

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/CartDao.java

@@ -34,6 +34,9 @@ public interface CartDao {
 	
 	//根据cartid删除购物车信息
 	public Integer deleteCartByCartId(CartDto cartDto);
+
+	/*获取购物车信息*/
+	public CartDto getCartDto(CartDto cartDto);
 	
 	//分页查询订单信息
 	public List<ShopOrderAndItemDto> selectShopOrder(PaperBean paperBean);

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/impl/CartDaoImpl.java

@@ -61,6 +61,11 @@ public class CartDaoImpl implements CartDao{
 		return cartMapper.getCartByCartProductId(cartDto);
 	}
 
+	@Override
+	public CartDto getCartDto(CartDto cartDto) {
+		// TODO Auto-generated method stub
+		return cartMapper.getCartDto(cartDto);
+	}
 
 	@Override
 	public Integer addProductToCart(CartDto cartDto) {

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/CartMapper.java

@@ -27,6 +27,9 @@ public interface CartMapper {
 	
 	//根据商品id和用户openid查询购物车是否有该商品
 	public CartDto getCartByCartProductId(CartDto cartDto);
+
+	/*获取购物车信息*/
+	public CartDto getCartDto(CartDto cartDto);
 	
 	//添加商品到购物车
 	public Integer addProductToCart(CartDto cartDto);

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

@@ -76,6 +76,19 @@ PUBLIC
 		AND 
 			CART_COLOR_ID = #{cartColorId} 
 	</select>
+
+	<!-- 获取购物车信息 -->
+	<select id="getCartDto" parameterType="CartDto" resultType="CartDto">
+		SELECT
+		CART_ID cartId,
+		CART_NUM cartNum
+		FROM
+		TB_IAMBERRY_SHOP_CART
+		WHERE
+		CART_OPENID = #{cartOpenId}
+		AND
+		CART_COLOR_ID = #{cartColorId}
+	</select>
 	
 	<!-- 新增购物车数据 -->
 	<insert id="addProductToCart" parameterType="CartDto" useGeneratedKeys="true" keyProperty="cartId">

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/CartHandlers.java

@@ -150,6 +150,38 @@ public class CartHandlers {
 		return remsg;
 	}
 
+
+	/**
+	 *  根据颜色id获取购物车数量
+	 * @param request
+	 * @return
+	 * @throws Exception
+	 */
+	@ResponseBody
+	@RequestMapping("/getCartColorNum")
+	public ResultMsg getCartColorNum(@RequestParam("colorId") Integer colorId,
+			HttpServletRequest request) throws Exception {
+		ResultMsg remsg=new ResultMsg();
+		Member member = WechatUtils.getUserBySession(request);
+		String openId  = member.getUserOpenid();
+
+		CartDto cartDto = new CartDto();
+		cartDto.setCartColorId(colorId);
+		cartDto.setCartOpenId(openId);
+		cartDto = this.cartService.getCartDto(cartDto);
+
+		Integer num = 0;
+		if(cartDto != null && cartDto.getCartNum() != null){
+			num = cartDto.getCartNum();
+		}
+		remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		remsg.setStatus(true);
+		remsg.setResultCode(ResultInfo.SUCCESSCODE);
+		remsg.setData(num);
+		return remsg;
+	}
+
+
 	/**
 	 * 首页添加商品到购物车post
 	 * @param cartNum

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -65,8 +65,7 @@ import com.iamberry.wechat.tools.ValidatorUtil;
  * Update Date:2016年4月20日
  */
 @Controller
-//@RequestMapping("/wechat/order")
-@RequestMapping("/order")
+@RequestMapping("/wechat/order")
 public class OrderHandler {
 
 	@Autowired