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-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -23,6 +23,7 @@ public class ResultInfo {
 	public  static String paramFormatError = "";
 	public  static String withdrawCountOutError = "";
 	public  static String cartEmptyError = "";
+	public  static String cartNoStatusError = "商品已下架";
 	public  static String userMoneyOutError = "";
 	public  static String userNoDrpError = "";
 	

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

@@ -252,7 +252,7 @@ PUBLIC
 	<!-- 根据购物车ID数组，批量获取购物车集合 -->
 	<select id="selectCartItemByListId" parameterType="java.util.List" resultType="CartDto">
 		SELECT 
-			C.CART_ID cartId, G.PRODUCT_ID cartProductId, pc.COLOR_ID cartColorId, G.PRODUCT_STATUS productStatus,
+			C.CART_ID cartId, G.PRODUCT_ID cartProductId, pc.COLOR_ID cartColorId, PC.color_status productStatus,
 			C.CART_NUM cartNum, G.PRODUCT_NAME productName, pc.COLOR_DISCOUNT productPrice, 
 
 			pc.color_img productIntroduceImg,

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

@@ -166,10 +166,13 @@ public class OrderHandler {
 
 		List<CartDto> tempCarts = new ArrayList<CartDto>();
 		for (CartDto cartDto : cartDtos) {
-			if (cartDto.getProductStatus() != null ) {
+			if (cartDto.getProductStatus() != null && cartDto.getProductStatus().intValue() == 1) {
 				total += cartDto.getCartNum() * cartDto.getProductPrice();
 				sum++;
 				tempCarts.add(cartDto);
+			}else if(cartDto.getProductStatus().intValue() != 1){
+				msg.setMessage(ResultInfo.cartNoStatusError);
+				return msg;
 			}
 			String[] els = element.split("-");
 			for(String el : els){
@@ -339,6 +342,9 @@ public class OrderHandler {
 				item.setItemProductPrice(cartDto.getProductDiscount());
 				item.setItemColorId(cartDto.getCartColorId());
 				list.add(item);
+			}else if(cartDto.getProductStatus().intValue() != 1){
+				msg.setMessage(ResultInfo.cartNoStatusError);
+				return msg;
 			}
 			if(cartDto.getProductType() == 100){		//当订单中有电动牙刷时，isContainProduct为true
 				isContainProduct = true;

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

@@ -63,7 +63,6 @@ public class OrderCloseListener {
 					validateCodeMap.put(orders.getSalesOrderid(), DateTimeUtil.format(new Date(),NameUtils.getConfig("DATE_TIME_FORMAT")));
 					break;
 				}
-				
 			}
 		}
 		moveValidateCodeMap();