From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ShoppingCartService.java |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 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 5de1816..7e47d31 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,8 +1,10 @@
 package com.ruoyi.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.order.vo.MyShoppingCartVo;
-import model.ShoppingCart;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.model.ShoppingCart;
+import com.ruoyi.order.vo.*;
 
 import java.util.List;
 
@@ -21,5 +23,31 @@
 	 * 添加商品
 	 * @param shoppingCart
 	 */
-	void addGoods(ShoppingCart shoppingCart);
+	Long addGoods(ShoppingCart shoppingCart);
+	
+	
+	/**
+	 * 修改购物车数量
+	 * @param setGoodsNumber
+	 * @return
+	 */
+	R setGoodsNumber(SetGoodsNumber setGoodsNumber);
+	
+	
+	/**
+	 * 确认购物车订单
+	 * @param confirmOrder
+	 * @return
+	 */
+	ConfirmOrderVo confirmOrder(ConfirmOrder confirmOrder);
+	
+	
+	/**
+	 * 购物车支付操作
+	 * @param shoppingCartPayment
+	 * @return
+	 */
+	R shoppingCartPayment(ShoppingCartPayment shoppingCartPayment);
+
+	Price getPrice(AppUser appUser, Integer goodsId, Integer shopId);
 }

--
Gitblit v1.7.1