Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

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

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

   public List<ShopShoppingCart> selectByCartUserId(@Param("shopId")Long shopId, @Param("cartUserId") String cartUserId);
   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);
   public int updateAllSelected(@Param("openId") String openId, @Param("shopId") Long shopId,  @Param("isSelected") Integer isSelected);

   /**
    * 删除用户选中的购物车明细