From 19dc96e814330dd957515b5eb4a57396af41b3b3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 15:10:19 +0800
Subject: [PATCH] 修改快递查询逻辑

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 0647455..81f8194 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -711,6 +711,14 @@
 					}
 				}
 			}
+			
+			if(goods.getStatus() == 1){
+				throw new RuntimeException(goods.getName() + "商品已被下架");
+			}
+			if(!goods.getCommodityAuthority().contains("-1") && !goods.getCommodityAuthority().contains(appUser.getVipId().toString())){
+				throw new RuntimeException("无权限购买" + goods.getName());
+			}
+			
 			ids.add(id);
 		}
 
@@ -1141,8 +1149,7 @@
 			//处理优惠券
 			if(null != order.getUserCouponId()){
 				UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
-				if(null != userCoupon && 1 == userCoupon.getStatus()){
-					userCoupon.setStatus(2);
+				if(null != userCoupon && null == userCoupon.getUseTime()){
 					userCoupon.setUseTime(LocalDateTime.now());
 					userCouponClient.editUserCoupon(userCoupon);
 				}
@@ -1367,7 +1374,7 @@
 		//处理优惠券
 		if(null != order.getUserCouponId()){
 			UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
-			if(null != userCoupon && 1 == userCoupon.getStatus()){
+			if(null != userCoupon && null == userCoupon.getUseTime()){
 				userCoupon.setStatus(2);
 				userCoupon.setUseTime(LocalDateTime.now());
 				userCouponClient.editUserCoupon(userCoupon);

--
Gitblit v1.7.1