Merge branch 'master' into online

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsCartItemServiceImpl.java

@@ -91,7 +91,7 @@ public class OmsCartItemServiceImpl implements OmsCartItemService {
                 throw new BizException("库存不足");
             }
             cartItem.setModifyDate(new Date());
-            existCartItem.setQuantity(existCartItem.getQuantity() + cartItem.getQuantity());
+            existCartItem.setQuantity(cartItem.getQuantity());
             cartItemMapper.updateByPrimaryKey(existCartItem);
         }
         return existCartItem;

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -197,7 +197,7 @@
 
 	<select id="queryCountOfUnread" resultMap="Mapper" parameterType="map">
 		SELECT group_ key_,COUNT(*) value_ FROM sys_message
-		WHERE user_id_ = #{userId} AND read_status_ = 0 and status_ = 2
+		WHERE user_id_ = #{userId} AND read_status_ = 0
 		AND (client_id_ = #{jpushType} OR client_id_ IS NULL)  and send_time_ &lt;= now()
 		<if test="type != null">
 		and type_ = #{type}