From 7b005ca364613c9738dbc66f3e4fe3fb7bec043d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 17 五月 2023 17:02:30 +0800
Subject: [PATCH] demo补完
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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 9fa1445..676834d 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,15 +3,16 @@
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.dto.AppBaseBathDto;
+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;
import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
import com.ruoyi.order.service.goods.GoodsService;
-import com.ruoyi.order.service.goods.ShopGoodsService;
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;
@@ -20,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
@@ -48,23 +51,35 @@
Long userId = SecurityUtils.getUserId();
if(userId!=null){
Member member = memberService.getMember(userId).getData();
- if(member!=null&&member.getRealtionShopId()!=null){
- appGoodsInfoGetDto.setShopId(member.getRealtionShopId());
+ if(member!=null&&member.getRelationShopId()!=null){
+ appGoodsInfoGetDto.setShopId(member.getRelationShopId());
+ }else{
+ appGoodsInfoGetDto.setShopId(1L);
}
}
AppGoodsInfoVo appGoodsInfoVo = goodsService.getGoodsInfo(appGoodsInfoGetDto);
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) {
Long userId = SecurityUtils.getUserId();
- if(userId!=null){
+ if(userId != null){
Member member = memberService.getMember(userId).getData();
appShoppingCartAddDto.setUserId(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appShoppingCartAddDto.setShopId(member.getRealtionShopId());
+ if(appShoppingCartAddDto.getShopId()==null&&member!=null&&member.getRelationShopId()!=null){
+ appShoppingCartAddDto.setShopId(member.getRelationShopId());
}
}
shoppingCartService.addShoppingCart(appShoppingCartAddDto);
@@ -78,8 +93,8 @@
if(userId!=null){
Member member = memberService.getMember(userId).getData();
appShoppingCartChangeDto.setUserId(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appShoppingCartChangeDto.setShopId(member.getRealtionShopId());
+ if(member!=null&&member.getRelationShopId()!=null){
+ appShoppingCartChangeDto.setShopId(member.getRelationShopId());
}
}
shoppingCartService.changeShoppingCart(appShoppingCartChangeDto);
@@ -90,10 +105,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