Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShoppingCartDao.java

@@ -36,13 +36,13 @@
   
   public ShopShoppingCart  selectById(Integer cartId);

   public List<ShopShoppingCart> selectByCartUserId(@Param("shopId")Long shopId, @Param("cartUserId") String cartUserId,@Param("cartType") Integer cartType);
   public List<ShopShoppingCart> selectByCartUserId(@Param("shopId")Long shopId, @Param("cartUserId") Long cartUserId);
   
   public ShopShoppingCart  selectForUpdate(Integer cartId);

   public ShopShoppingCart selectBuyLimit(@Param("cartProductId") Integer cartProductId,@Param("cartSkuId") Integer cartSkuId);

   public Integer selectUserCartCount(@Param("shopId")Long shopId, @Param("openId")String openId);
   public Integer selectUserCartCount(@Param("shopId")Long shopId, @Param("userId")Long userId);

   public int updateAllSelected(@Param("openId") String openId, @Param("shopId") Long shopId,  @Param("isSelected") Integer isSelected);