From 5c6b1469792343d30781074c18880259498109b4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 09 一月 2025 18:11:37 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 36d8d92..7e53d6e 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
@@ -502,7 +502,7 @@
 		confirmOrderVo.setEarnPoint(earnPoint);
 		//支付金额,订单金额-订单优惠
 		confirmOrderVo.setPayMoney(paymentMoney);
-		confirmOrderVo.setResidualPoint(appUser.getLavePoint().intValue());
+		confirmOrderVo.setResidualPoint(appUser.getAvailablePoint().intValue());
 		//获取默认收货地址
 		UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData();
 		if(null != userAddress){
@@ -1148,8 +1148,9 @@
 			if(transferablePoint > 0){
 				tra = transferablePoint - orderPoint;
 				appUser.setTransferablePoint(tra >= 0 ? tra : 0);
+			}else{
+				appUser.setTransferablePoint(appUser.getTransferablePoint() - orderPoint);
 			}
-			appUser.setTransferablePoint(appUser.getTransferablePoint() - orderPoint);
 
 			//构建积分流水记录
 			UserPoint userPoint = new UserPoint();
@@ -1408,7 +1409,7 @@
 	public void closeOrder() {
 		//订单支付数据
 		long second = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
-		Set<String> orderPayment = redisTemplate.opsForZSet().range("OrderPayment", 0, second);
+		Set<String> orderPayment = redisTemplate.opsForZSet().rangeByScore("OrderPayment", 0, second);
 		if(orderPayment.size() > 0){
 			List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderNumber, orderPayment));
 			for (Order order : list) {
@@ -1428,7 +1429,7 @@
 		}
 		
 		//快递支付
-		Set<String> materialFlowPayment = redisTemplate.opsForZSet().range("MaterialFlowPayment", 0, second);
+		Set<String> materialFlowPayment = redisTemplate.opsForZSet().rangeByScore("MaterialFlowPayment", 0, second);
 		if(materialFlowPayment.size() > 0){
 			materialFlowPayment.forEach(s->s.substring(1));
 			List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderNumber, materialFlowPayment));

--
Gitblit v1.7.1