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-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/cartMapper.xml

@@ -77,7 +77,7 @@ PUBLIC
 			CART_COLOR_ID = #{cartColorId} 
 	</select>
 
-	<!-- 获取购物车信息 -->
+	<!-- 获取购物车信息看是否有记录该商品信息 -->
 	<select id="getCartDto" parameterType="CartDto" resultType="CartDto">
 		SELECT
 		CART_ID cartId,
@@ -116,7 +116,7 @@ PUBLIC
 	
 	<!-- 分页查询销售订单表 -->
 	<select id="selectShopOrder" parameterType="PaperBean" resultMap="orderListMap">
-		SELECT DISTINCT O.SALES_ORDERID, O.SALES_STATUS, O.SALES_CREATE_DATE, 
+		SELECT DISTINCT O.SALES_ORDERID, O.SALES_STATUS, O.SALES_CREATE_DATE, O.SALES_YET_AMOUNT,
 			O.SALES_AMOUNT, O.SALES_INTEGRAL_NUM, O.SALES_RATE_AMOUNT, 
 			O.SALES_ADDRESS_INFO, O.SALES_ADDRESS_NAME, 
 			O.SALES_USER_REMARK, O.SALES_POST_NUM, O.SALES_POST_FIRM, 
@@ -147,6 +147,7 @@ PUBLIC
 		<result column="SALES_STATUS" property="salesStatus"/>
 		<result column="SALES_CREATE_DATE" property="salesCreateDate"/>
 		<result column="SALES_AMOUNT" property="salesAmount"/>
+		<result column="SALES_YET_AMOUNT" property="salesYetAmount"/>
 		<result column="SALES_INTEGRAL_NUM" property="salesIntegralNum"/>
 		<result column="SALES_RATE_AMOUNT" property="salesRateAmount"/>
 		<result column="SALES_ADDRESS_INFO" property="salesAddressInfo"/>

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

@@ -170,14 +170,13 @@ public class CartHandlers {
 		cartDto.setCartOpenId(openId);
 		cartDto = this.cartService.getCartDto(cartDto);
 
-		Integer num = 0;
-		if(cartDto != null && cartDto.getCartNum() != null){
-			num = cartDto.getCartNum();
+		if(cartDto == null || cartDto.getCartNum() == null){
+			cartDto = null;
 		}
 		remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
 		remsg.setStatus(true);
 		remsg.setResultCode(ResultInfo.SUCCESSCODE);
-		remsg.setData(num);
+		remsg.setData(cartDto);
 		return remsg;
 	}