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/controller/ShoppingCartController.java |    8 ++------
 1 files changed, 2 insertions(+), 6 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 da51645..5be0fba 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
@@ -42,11 +42,7 @@
 	
 	@Resource
 	private TokenService tokenService;
-
-	@Resource
-	private GoodsShopClient goodsShopClient;
-	@Resource
-	private ShopClient shopClient;
+	
 	@Resource
 	private AppUserClient appUserClient;
 	
@@ -169,7 +165,7 @@
 	@GetMapping("/getGoodsPrice")
 	public R<Price> getGoodsPrice(Long appUserId, Integer goodsId, Integer shopId){
 		AppUser appUser = appUserClient.getAppUserById(appUserId);
-		Price price = shoppingCartService.getPrice(appUser, goodsId, shopId);
+		Price price = shoppingCartService.getPrice(appUser, goodsId, 1, shopId);
 		return R.ok(price);
 	}
 	

--
Gitblit v1.7.1