From 3d6c34f45d76b78151d6586f93acca2943698b08 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 09 十二月 2024 10:56:42 +0800
Subject: [PATCH] 1.

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java |   40 +++++++++++++++++++++++++++++++---------
 1 files changed, 31 insertions(+), 9 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 aeaa5dc..a4d0f97 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
@@ -2,15 +2,15 @@
 
 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.TableDataInfo;
+import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.order.service.ShoppingCartService;
 import com.ruoyi.order.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import model.ShoppingCart;
+import com.ruoyi.order.model.ShoppingCart;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -22,6 +22,12 @@
 
 	@Resource
 	private ShoppingCartService shoppingCartService;
+	
+	@Resource
+	private TokenService tokenService;
+	
+	
+	
 
 	
 	@ResponseBody
@@ -47,27 +53,43 @@
 	@ResponseBody
 	@PostMapping("/setGoodsNumber")
 	@ApiOperation(value = "修改购物车数量", tags = {"商城-购物车-小程序"})
-	public AjaxResult setGoodsNumber(@RequestBody SetGoodsNumber setGoodsNumber){
+	public R setGoodsNumber(@RequestBody SetGoodsNumber setGoodsNumber){
 		return shoppingCartService.setGoodsNumber(setGoodsNumber);
 	}
 	
 	
 	
 	@ResponseBody
+	@DeleteMapping("/delShoppingCart")
+	@ApiOperation(value = "删除购物车", tags = {"商城-购物车-小程序"})
+	public R delShoppingCart(Long id){
+		Long userid = tokenService.getLoginUserApplet().getUserid();
+		ShoppingCart shoppingCart = shoppingCartService.getById(id);
+		if(!userid.equals(shoppingCart.getAppUserId())){
+			return R.fail("权限不足,不允许此操作");
+		}
+		shoppingCartService.removeById(id);
+		return R.ok();
+	}
+	
+	
+	
+	
+	
+	@ResponseBody
 	@PostMapping("/confirmOrder")
 	@ApiOperation(value = "确定购物车订单", tags = {"商城-购物车-小程序"})
-	public AjaxResult<ConfirmOrderVo> confirmOrder(@RequestBody ConfirmOrder confirmOrder){
-		// todo 待完善 pu
-		return AjaxResult.success();
+	public R<ConfirmOrderVo> confirmOrder(@RequestBody ConfirmOrder confirmOrder){
+		ConfirmOrderVo confirmOrderVo = shoppingCartService.confirmOrder(confirmOrder);
+		return R.ok(confirmOrderVo);
 	}
 	
 	
 	@ResponseBody
 	@PostMapping("/shoppingCartPayment")
 	@ApiOperation(value = "购物车订单支付", tags = {"商城-购物车-小程序"})
-	public AjaxResult<Void> shoppingCartPayment(@RequestBody ShoppingCartPayment shoppingCartPayment){
-		// todo 待完善 pu
-		return AjaxResult.success();
+	public R<Void> shoppingCartPayment(@RequestBody ShoppingCartPayment shoppingCartPayment){
+		return shoppingCartService.shoppingCartPayment(shoppingCartPayment);
 	}
 	
 	

--
Gitblit v1.7.1