wangqifan 4 anni fa
parent
commit
6cbae2260b

+ 6 - 8
src/main/java/com/izouma/tcg/dto/delay/DelayOrder.java

@@ -17,7 +17,7 @@ public class DelayOrder implements Delayed {
     /**
      * 单号
      */
-    private Long orderInfoId;
+    private Long          orderInfoId;
     /**
      * 创建时间
      */
@@ -26,10 +26,10 @@ public class DelayOrder implements Delayed {
     /**
      * 过期时间(单位为毫秒,这里表示10秒)
      */
-    private static final long expireTime = 5*60*1000;
+    private static final long expireTime = 5 * 60 * 1000;
 
     @Override
-    public boolean equals(Object object){
+    public boolean equals(Object object) {
         if (object instanceof DelayOrder) {
             DelayOrder o = (DelayOrder) object;
             return orderInfoId != null && o.orderInfoId != null && orderInfoId.equals(o.orderInfoId);
@@ -39,14 +39,12 @@ public class DelayOrder implements Delayed {
 
     @Override
     public long getDelay(TimeUnit unit) {
-        long result = unit.convert(this.createTime.toInstant(ZoneOffset.of("+8")).
-                toEpochMilli()+expireTime-System.currentTimeMillis(),TimeUnit.MILLISECONDS);
-        return result;
+        return unit.convert(this.createTime.toInstant(ZoneOffset.of("+8")).
+                toEpochMilli() + expireTime - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
     }
 
     @Override
     public int compareTo(Delayed o) {
-        int result = this.getCreateTime().compareTo(((DelayOrder) o).getCreateTime());
-        return result;
+        return this.getCreateTime().compareTo(((DelayOrder) o).getCreateTime());
     }
 }

+ 1 - 1
src/main/java/com/izouma/tcg/service/delay/OrderDelayService.java

@@ -21,7 +21,7 @@ import java.util.concurrent.DelayQueue;
 @Service
 public class OrderDelayService {
 
-    private Log logger = LogFactory.getLog(this.getClass());
+    private final Log logger = LogFactory.getLog(this.getClass());
 
     @Autowired
     private OrderInfoService orderFormService;

+ 5 - 1
src/main/java/com/izouma/tcg/service/orderInfo/OrderInfoService.java

@@ -17,6 +17,7 @@ import com.izouma.tcg.repo.card.CardCaseRepo;
 import com.izouma.tcg.repo.orderInfo.OrderInfoRepo;
 import com.izouma.tcg.repo.orderInfo.TransactionRecordRepo;
 import com.izouma.tcg.service.card.CardCaseService;
+import com.izouma.tcg.service.delay.OrderDelayService;
 import com.izouma.tcg.utils.*;
 import lombok.AllArgsConstructor;
 import org.apache.commons.beanutils.ConvertUtils;
@@ -41,6 +42,7 @@ public class OrderInfoService {
     private final CardCaseRepo          cardCaseRepo;
     private final Cache<String, Object> caffeineCache;
     private final TransactionRecordRepo transactionRecordRepo;
+    private final OrderDelayService     orderDelayService;
 
     public Page<OrderInfo> all(PageQuery pageQuery) {
         return orderInfoRepo
@@ -72,7 +74,9 @@ public class OrderInfoService {
             cardBox.setOrderInfoId(saved.getId());
             cardBoxRepo.save(cardBox);
         });
-        return orderInfoRepo.findById(saved.getId()).orElseThrow(new BusinessException("未找到"));
+        OrderInfo result = orderInfoRepo.findById(saved.getId()).orElseThrow(new BusinessException("未找到"));
+        orderDelayService.orderDelay(result.getId(), result.getCreatedAt());
+        return result;
     }
 
     public boolean checkBox(String boxIdStr, Long caseId) {