From 43d9975c99cb947b4602f05bc2e513a20de92c38 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 06 五月 2023 20:30:42 +0800
Subject: [PATCH] 商户端主流程

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 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 b1039ae..4fd0949 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
@@ -3,6 +3,7 @@
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.order.domain.vo.AppShoppingCartVo;
 import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
 import com.ruoyi.order.domain.dto.AppGoodsInfoGetDto;
 import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
@@ -11,6 +12,7 @@
 import com.ruoyi.order.service.goods.GoodsService;
 import com.ruoyi.order.service.order.ShoppingCartService;
 import com.ruoyi.system.api.RemoteMemberService;
+import com.ruoyi.system.api.domain.dto.AppBaseDto;
 import com.ruoyi.system.api.domain.poji.member.Member;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,6 +21,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * @author jqs34
@@ -55,6 +59,16 @@
         return R.ok(appGoodsInfoVo);
     }
 
+    @RequestMapping(value = "/listShoppingCart", method = RequestMethod.POST)
+    @ApiOperation(value = "获取购物车列表")
+    public R<List<AppShoppingCartVo>> listShoppingCart() {
+        Long userId = SecurityUtils.getUserId();
+        Member member = memberService.getMember(userId).getData();
+        Long shopId = member.getRelationShopId();
+        List<AppShoppingCartVo> appShoppingCartVoList = shoppingCartService.listShoppingCartVo(userId, shopId);
+        return R.ok(appShoppingCartVoList);
+    }
+
     @RequestMapping(value = "/addShoppingCart", method = RequestMethod.POST)
     @ApiOperation(value = "添加购物车")
     public R addShoppingCart(@RequestBody AppShoppingCartAddDto appShoppingCartAddDto) {
@@ -89,10 +103,7 @@
     @ApiOperation(value = "删除购物车")
     public R changeShoppingCart(@RequestBody AppBaseBathDto appBaseBathDto) {
         Long userId = SecurityUtils.getUserId();
-        if(userId!=null){
-            Member member = memberService.getMember(userId).getData();
-            appBaseBathDto.setUserId(userId);
-        }
+        appBaseBathDto.setUserId(userId);
         shoppingCartService.deleteShoppingCart(appBaseBathDto);
         return R.ok();
     }

--
Gitblit v1.7.1