From 3d6f2cd1483c5e85a3f2eeb2edd89c088d1d5c6b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 22:52:48 +0800
Subject: [PATCH] DEMO初步完成
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 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 cb12e94..0645b43 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
@@ -1,16 +1,18 @@
package com.ruoyi.order.controller.miniapp;
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;
@@ -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
@@ -29,8 +33,8 @@
*/
@Api(value = "小程序商品相关接口", tags = "小程序商品相关接口", description = "小程序商品相关接口")
@RestController
-@RequestMapping("/app/home")
-public class AppGoodsController {
+@RequestMapping("/app/goods")
+public class AppGoodsController extends BaseController {
@Autowired
private GoodsService goodsService;
@@ -47,12 +51,22 @@
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());
}
}
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)
@@ -62,8 +76,8 @@
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);
@@ -77,8 +91,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);
@@ -89,11 +103,11 @@
@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