dd

ruoyi-api/src/main/java/com/ruoyi/api/controller/user/ApiUserShoppingCartController.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.enums.FilePathSplicingType;
 import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.shop.business.service.IUserBusinessRoleService;
 import com.ruoyi.shop.usershoppingcart.domain.vo.UserShoppingCartGroupVo;
+import com.ruoyi.shop.usershoppingcart.domain.vo.UserShoppingCartVo;
 import lombok.RequiredArgsConstructor;
 
 import javax.validation.constraints.*;
@@ -60,6 +61,19 @@ public class ApiUserShoppingCartController extends AbstractApiController {
         return R.ok(iUserShoppingCartService.queryGroupList(bo));
     }
 
+    /**
+     * 查询会员某个店铺的购物车列表
+     */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
+    @ApiOperation("查询会员某个店铺的购物车列表")
+    @GetMapping("/businessList/{businessId}")
+    public R<List<UserShoppingCartVo>> businessList(@NotNull(message = "商户ID不能为空") @PathVariable("businessId")  Long businessId) {
+        UserShoppingCartBo bo = new UserShoppingCartBo();
+        bo.setBusinessId(businessId);
+        bo.setUserId(getUserId(true));
+        return R.ok(iUserShoppingCartService.queryList(bo));
+    }
+
 
     /**
      * 新增和设置会员的购物车

ruoyi-shop/src/main/java/com/ruoyi/shop/usershoppingcart/service/impl/UserShoppingCartServiceImpl.java

@@ -87,9 +87,6 @@ public class UserShoppingCartServiceImpl implements IUserShoppingCartService {
         lqw.eq(bo.getNum() != null, UserShoppingCart::getNum, bo.getNum());
         lqw.like(StringUtils.isNotBlank(bo.getSkuSetName()), UserShoppingCart::getSkuSetName, bo.getSkuSetName());
         lqw.eq(StringUtils.isNotBlank(bo.getSkuHashCode()), UserShoppingCart::getSkuHashCode, bo.getSkuHashCode());
-        lqw.eq(bo.getOriginalSalePrice() != null, UserShoppingCart::getOriginalSalePrice, bo.getOriginalSalePrice());
-        lqw.eq(bo.getSalePrice() != null, UserShoppingCart::getSalePrice, bo.getSalePrice());
-        lqw.eq(bo.getPoint() != null, UserShoppingCart::getPoint, bo.getPoint());
         return lqw;
     }