From d3abd08d49bd74000d57bd3ba97537f4fc14fa2b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 20:29:51 +0800
Subject: [PATCH] DEMO初步完成

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java
index 03fbe99..f11ec84 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java
@@ -4,7 +4,8 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.order.domain.dto.AppBaseBathDto;
+import com.ruoyi.order.domain.vo.AppShoppingCartVo;
+import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
 import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
 import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
 import com.ruoyi.order.domain.pojo.goods.Goods;
@@ -17,6 +18,7 @@
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -41,18 +43,19 @@
      */
     @Override
     public void addShoppingCart(AppShoppingCartAddDto appShoppingCartAddDto){
-        Long goodsId = appShoppingCartAddDto.getGoodsId();
+        String goodsId = appShoppingCartAddDto.getGoodsId();
         Goods goods = goodsService.getById(goodsId);
         if(goods.getGoodsStatus()!=1){
             throw new ServiceException(AppErrorConstant.GOODS_DOWN);
         }
         LambdaQueryWrapper<ShoppingCart> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(ShoppingCart::getDelFlag, 0).eq(ShoppingCart::getGoodsId, goodsId);
-        ShoppingCart shoppingCart = this.getOne(queryWrapper);
+        ShoppingCart shoppingCart = this.getOne(queryWrapper,false);
         if(shoppingCart==null){
             shoppingCart = new ShoppingCart();
             shoppingCart.setUserId(appShoppingCartAddDto.getUserId());
             shoppingCart.setShopId(appShoppingCartAddDto.getShopId());
+            shoppingCart.setGoodsId(appShoppingCartAddDto.getGoodsId());
             shoppingCart.setBuyNum(appShoppingCartAddDto.getBuyNum());
             shoppingCart.setDelFlag(0);
             shoppingCart.setCreateTime(new Date());
@@ -70,14 +73,13 @@
      */
     @Override
     public void changeShoppingCart(AppShoppingCartChangeDto appShoppingCartChangeDto){
-        Long goodsId = appShoppingCartChangeDto.getGoodsId();
+        Long shoppingCartId = appShoppingCartChangeDto.getShoppingCartId();
+        ShoppingCart shoppingCart = this.getById(shoppingCartId);
+        String goodsId = shoppingCart.getGoodsId();
         Goods goods = goodsService.getById(goodsId);
         if(goods.getGoodsStatus()!=1){
             throw new ServiceException(AppErrorConstant.GOODS_DOWN);
         }
-        LambdaQueryWrapper<ShoppingCart> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(ShoppingCart::getDelFlag, 0).eq(ShoppingCart::getGoodsId, goodsId);
-        ShoppingCart shoppingCart = this.getOne(queryWrapper);
         shoppingCart.setBuyNum(appShoppingCartChangeDto.getBuyNum());
         shoppingCart.setUpdateTime(new Date());
         this.saveOrUpdate(shoppingCart);
@@ -92,4 +94,15 @@
         String ids = appBaseBathDto.getIds();
         shoppingCartMapper.deleteShoppingCartByIds(ids);
     }
+
+    /**
+     *
+     * @param userId
+     * @param shopId
+     * @return
+     */
+    @Override
+    public List<AppShoppingCartVo> listShoppingCartVo(Long userId, Long shopId){
+        return shoppingCartMapper.listShoppingCartVo(userId, shopId);
+    }
 }

--
Gitblit v1.7.1