Parcourir la source

支付回调修改

lianghanqiang il y a 4 ans
Parent
commit
06b6b4e410

+ 5 - 5
src/main/java/org/springblade/common/cache/PaymentCache.java

@@ -11,6 +11,7 @@ import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.payment.entity.SuccessParams;
 import org.springframework.data.redis.core.RedisTemplate;
 
+import java.time.Duration;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
@@ -33,9 +34,6 @@ public class PaymentCache {
 
 	static   {
 		 bladeRedis = SpringUtil.getBean("bladeRedis");
-		 if(Objects.isNull(bladeRedis)){
-		 	throw new ServiceException(ResCode.USER_PWS_ERROR);
-		 }
 	}
 
 	/**
@@ -108,7 +106,8 @@ public class PaymentCache {
 	 * @return
 	 */
 	public static void putSuccessParams(String billId, SuccessParams successParams) {
-		CacheUtil.put(CacheNames.PAYMENT, ORDER_INFO, billId, JSON.toJSONString(successParams),false);
+		bladeRedis.setEx(CacheNames.PAYMENT.concat(ORDER_INFO).concat(billId), JSON.toJSONString(successParams),Duration.ofDays(1L));
+//		CacheUtil.put(CacheNames.PAYMENT, ORDER_INFO, billId, JSON.toJSONString(successParams),false);
 	}
 
 	/**
@@ -117,7 +116,8 @@ public class PaymentCache {
 	 * @return
 	 */
 	public static SuccessParams getSuccessParams(String billId) {
-		String params =  CacheUtil.get(CacheNames.PAYMENT, ORDER_INFO, billId,String.class,false);
+//		String params =  CacheUtil.get(CacheNames.PAYMENT, ORDER_INFO, billId,String.class,false);
+		String params =  bladeRedis.get(CacheNames.PAYMENT.concat(ORDER_INFO).concat(billId));
 		return JSON.parseObject(params,SuccessParams.class);
 	}
 

+ 1 - 1
src/main/java/org/springblade/payment/plugin/YeePayPlugin.java

@@ -126,7 +126,7 @@ public class YeePayPlugin implements Payment {
 
 		SuccessParams successParams = PaymentCache.getSuccessParams(jsonObject.getString("orderId"));
 
-		Assert.notNull(successParams,"订单回调参数数据获取失败!");
+		Assert.notNull(successParams,"订单超时,请重新支付!!");
 		successParams.setRes(jsonObject);
 		successParams.setStatus(
 			"SUCCESS".equals(jsonObject.getString("status")) ?