From 06f455915bb9d11caa8829942f9007809ee9ae3d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 28 十一月 2024 16:37:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
index 6132371..aeaa5dc 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
@@ -1,8 +1,8 @@
package com.ruoyi.order.controller;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.BaseTable;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.order.service.ShoppingCartService;
import com.ruoyi.order.vo.*;
@@ -10,6 +10,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import model.ShoppingCart;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -18,10 +19,10 @@
@RequestMapping("/shopping-cart")
@Api(tags = "购物车")
public class ShoppingCartController extends BaseController {
-
+
@Resource
private ShoppingCartService shoppingCartService;
-
+
@ResponseBody
@GetMapping("/getMyShoppingCart/{type}/{shopId}")
@@ -34,14 +35,20 @@
startPage();
return getDataTable(shoppingCartService.getMyShoppingCart(type, shopId));
}
+
+ @PostMapping("/addGoods")
+ @ApiOperation(value = "添加购物车", tags = {"商城-购物车-小程序"})
+ public R<Void> addGoods(@RequestBody ShoppingCart shoppingCart) {
+ shoppingCartService.addGoods(shoppingCart);
+ return R.ok();
+ }
@ResponseBody
@PostMapping("/setGoodsNumber")
@ApiOperation(value = "修改购物车数量", tags = {"商城-购物车-小程序"})
public AjaxResult setGoodsNumber(@RequestBody SetGoodsNumber setGoodsNumber){
- // todo 待完善 pu
- return AjaxResult.success();
+ return shoppingCartService.setGoodsNumber(setGoodsNumber);
}
@@ -58,7 +65,7 @@
@ResponseBody
@PostMapping("/shoppingCartPayment")
@ApiOperation(value = "购物车订单支付", tags = {"商城-购物车-小程序"})
- public AjaxResult shoppingCartPayment(@RequestBody ShoppingCartPayment shoppingCartPayment){
+ public AjaxResult<Void> shoppingCartPayment(@RequestBody ShoppingCartPayment shoppingCartPayment){
// todo 待完善 pu
return AjaxResult.success();
}
--
Gitblit v1.7.1