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-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/StayIntegral.java

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

@@ -39,7 +39,7 @@ PUBLIC
 		COUNT(*)
 		FROM tb_iamberry_shop_sales_order
 		WHERE  sales_openid=#{openid}
-		AND sales_send_date is null
+		AND sales_status = 2
 	</select>
 
 	<!-- 后台订单列表查询 -->