From c27c1f2beb4ca89a94eaa854fce6b4553db8f2f8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 19:58:12 +0800
Subject: [PATCH] 修改

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ShoppingCartService.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 48 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..5fdd626 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,11 @@
 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.account.api.model.AppUser;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.model.ShoppingCart;
+import com.ruoyi.order.util.payment.model.UniPayCallbackResult;
+import com.ruoyi.order.vo.*;
 
 import java.util.List;
 
@@ -24,7 +24,7 @@
 	 * 添加商品
 	 * @param shoppingCart
 	 */
-	void addGoods(ShoppingCart shoppingCart);
+	Long addGoods(ShoppingCart shoppingCart);
 	
 	
 	/**
@@ -32,5 +32,46 @@
 	 * @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);
+	
+	
+	/**
+	 * 订单支付回调处理逻辑
+	 * @param uniPayCallbackResult
+	 * @return
+	 */
+	R shoppingCartPaymentCallback(UniPayCallbackResult uniPayCallbackResult);
+	
+	/**
+	 * 订单物流支付回调处理
+	 * @param uniPayCallbackResult
+	 * @return
+	 */
+	R shoppingCartMaterialFlowPaymentCallback(UniPayCallbackResult uniPayCallbackResult);
+	
+
+	Price getPrice(AppUser appUser, Integer goodsId, Integer type, Integer shopId);
+	
+	
+	/**
+	 * 定时任务关闭订单
+	 */
+	void closeOrder();
+	
 }

--
Gitblit v1.7.1