From 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Wed, 07 Apr 2021 11:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShoppingCartDao.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShoppingCartDao.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShoppingCartDao.java
index 89a5eb1..b31b054 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShoppingCartDao.java
+++ b/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,@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,@Param("artType") Integer artType);
+	public int updateAllSelected(@Param("openId") String openId, @Param("shopId") Long shopId,  @Param("isSelected") Integer isSelected);
 
 	/**
 	 * 删除用户选中的购物车明细

--
Gitblit v1.9.1