From 768a9ef990c196e06f85d4a770a274470d7e57df Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期四, 11 五月 2023 22:49:03 +0800
Subject: [PATCH] 修改订单报错

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java |   18 ++++++++++++------
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java      |    2 +-
 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ShoppingCartMapper.xml                        |    2 +-
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ShoppingCartMapper.java            |    2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
index 0645b43..cd46e4a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
@@ -73,7 +73,7 @@
     @ApiOperation(value = "添加购物车")
     public R addShoppingCart(@RequestBody AppShoppingCartAddDto appShoppingCartAddDto) {
         Long userId = SecurityUtils.getUserId();
-        if(userId!=null){
+        if(userId != null){
             Member member = memberService.getMember(userId).getData();
             appShoppingCartAddDto.setUserId(userId);
             if(appShoppingCartAddDto.getShopId()==null&&member!=null&&member.getRelationShopId()!=null){
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ShoppingCartMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ShoppingCartMapper.java
index f63ccd1..d610711 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ShoppingCartMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ShoppingCartMapper.java
@@ -21,7 +21,7 @@
      * 批量删除
      * @param ids
      */
-    void deleteShoppingCartByIds(String ids);
+    void deleteShoppingCartByIds(List<String> ids);
 
     /**
      *
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 f11ec84..3b08e20 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
@@ -2,21 +2,22 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.vo.AppShoppingCartVo;
-import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
+import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
 import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
 import com.ruoyi.order.domain.pojo.goods.Goods;
 import com.ruoyi.order.domain.pojo.order.ShoppingCart;
+import com.ruoyi.order.domain.vo.AppShoppingCartVo;
 import com.ruoyi.order.mapper.order.ShoppingCartMapper;
 import com.ruoyi.order.service.goods.GoodsService;
 import com.ruoyi.order.service.order.ShoppingCartService;
 import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -49,7 +50,11 @@
             throw new ServiceException(AppErrorConstant.GOODS_DOWN);
         }
         LambdaQueryWrapper<ShoppingCart> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(ShoppingCart::getDelFlag, 0).eq(ShoppingCart::getGoodsId, goodsId);
+        queryWrapper.eq(ShoppingCart::getDelFlag, 0)
+                .eq(ShoppingCart::getGoodsId, goodsId)
+                .eq(ShoppingCart::getUserId, appShoppingCartAddDto.getUserId())
+                .eq(ShoppingCart::getShopId, appShoppingCartAddDto.getShopId());
+
         ShoppingCart shoppingCart = this.getOne(queryWrapper,false);
         if(shoppingCart==null){
             shoppingCart = new ShoppingCart();
@@ -91,8 +96,9 @@
      */
     @Override
     public void deleteShoppingCart(AppBaseBathDto appBaseBathDto){
-        String ids = appBaseBathDto.getIds();
-        shoppingCartMapper.deleteShoppingCartByIds(ids);
+        String[] ids = appBaseBathDto.getIds().split(",");
+        List<String> list = Arrays.asList(ids);
+        shoppingCartMapper.deleteShoppingCartByIds(list);
     }
 
     /**
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ShoppingCartMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ShoppingCartMapper.xml
index 00a68bf..64c2a34 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ShoppingCartMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ShoppingCartMapper.xml
@@ -74,7 +74,7 @@
 
     <delete id="deleteShoppingCartByIds" parameterType="String">
         update t_shopping_cart set del_flag = 1 where id in
-        <foreach item="ids" collection="array" open="(" separator="," close=")">
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>

--
Gitblit v1.7.1