From fd45fcbd496bbeaf9ee18edd8f2f858cf9cebaf3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:47:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ShoppingCartService.java |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 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 cda3616..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,8 +1,10 @@
 package com.ruoyi.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+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;
@@ -22,7 +24,7 @@
 	 * 添加商品
 	 * @param shoppingCart
 	 */
-	void addGoods(ShoppingCart shoppingCart);
+	Long addGoods(ShoppingCart shoppingCart);
 	
 	
 	/**
@@ -47,4 +49,29 @@
 	 * @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