zoujiajian há 1 ano atrás
pai
commit
ff2a472a08

+ 1 - 6
netflix-service/src/main/java/com/cyksj/service/pay/impl/AliPayCommonServiceImpl.java

@@ -1,6 +1,5 @@
 package com.cyksj.service.pay.impl;
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alipay.api.AlipayApiException;
@@ -363,10 +362,6 @@ public class AliPayCommonServiceImpl implements AliPayCommonService {
 		if (ZfbProductCode.MOBILE_WEB.getProductCode().equals(productCode)) {
 			orderDon.setIsWebPay(false);
 		}
-		//押金超过五分钟重新生成一个订单号
-		if (orderDon.getCreatedTime().compareTo(DateUtil.offsetMinute(DateTime.now(), -5)) <= 0) {
-			orderDon.setOrderNo(SEQUENCE.nextId().toString());
-		}
 		depositMapper.updateById(orderDon);
 		String subject = "押金";
 		//回调地址
@@ -382,7 +377,7 @@ public class AliPayCommonServiceImpl implements AliPayCommonService {
 				orderDon.getOrderNo(),
 				orderDon.getShopId(),
 				orderDon.getMoney(),
-				orderDon.getCreatedTime(),
+				orderDon.getUpdateTime(),
 				subject,
 				productCode,
 				payMode,