From fb6eee80334ae23a2eca8c37baeef05e86c919ed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 17:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ShoppingCartService.java |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ShoppingCartService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ShoppingCartService.java
index 2e414aa..f827055 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ShoppingCartService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ShoppingCartService.java
@@ -1,11 +1,9 @@
 package com.ruoyi.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.order.vo.MyShoppingCartVo;
-import com.ruoyi.order.vo.SetGoodsNumber;
-import model.ShoppingCart;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.model.ShoppingCart;
+import com.ruoyi.order.vo.*;
 
 import java.util.List;
 
@@ -24,7 +22,7 @@
 	 * 添加商品
 	 * @param shoppingCart
 	 */
-	void addGoods(ShoppingCart shoppingCart);
+	Long addGoods(ShoppingCart shoppingCart);
 	
 	
 	/**
@@ -32,5 +30,21 @@
 	 * @param setGoodsNumber
 	 * @return
 	 */
-	AjaxResult setGoodsNumber(SetGoodsNumber setGoodsNumber);
+	R setGoodsNumber(SetGoodsNumber setGoodsNumber);
+	
+	
+	/**
+	 * 确认购物车订单
+	 * @param confirmOrder
+	 * @return
+	 */
+	ConfirmOrderVo confirmOrder(ConfirmOrder confirmOrder);
+	
+	
+	/**
+	 * 购物车支付操作
+	 * @param shoppingCartPayment
+	 * @return
+	 */
+	R shoppingCartPayment(ShoppingCartPayment shoppingCartPayment);
 }

--
Gitblit v1.7.1