wangqifan 3 years ago
parent
commit
de60411fdd

+ 1 - 1
src/main/java/com/izouma/nineth/repo/DomainOrderRepo.java

@@ -26,7 +26,7 @@ public interface DomainOrderRepo extends JpaRepository<DomainOrder, Long>, JpaSp
 
     Page<DomainOrder> findAllByOrderStatusOrderByCreatedAtDesc(OrderStatus status, Pageable pageable);
 
-    DomainOrder findByDomainNameAndOrderStatus(String name, OrderStatus status);
+    DomainOrder findFirstByDomainNameAndOrderStatus(String name, OrderStatus status);
 
     List<DomainOrder> findAllByStatusAndCreatedAtBeforeAndOrderStatus(CollectionStatus status, LocalDateTime endTime, OrderStatus orderStatus);
 

+ 2 - 2
src/main/java/com/izouma/nineth/web/AssetController.java

@@ -76,7 +76,7 @@ public class AssetController extends BaseController {
             if (asset.getType().equals(CollectionType.DOMAIN)) {
                 String domainName = asset.getName().substring(9);
                 DomainOrder domainOrder = domainOrderRepo
-                        .findByDomainNameAndOrderStatus(domainName, OrderStatus.FINISH);
+                        .findFirstByDomainNameAndOrderStatus(domainName, OrderStatus.FINISH);
                 if (domainOrder != null)
                     asset.setEndTime(domainOrder.getEndTime());
             }
@@ -103,7 +103,7 @@ public class AssetController extends BaseController {
         Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         if (asset.getType().equals(CollectionType.DOMAIN)) {
             String domainName = asset.getName().substring(9);
-            DomainOrder domainOrder = domainOrderRepo.findByDomainNameAndOrderStatus(domainName, OrderStatus.FINISH);
+            DomainOrder domainOrder = domainOrderRepo.findFirstByDomainNameAndOrderStatus(domainName, OrderStatus.FINISH);
             asset.setEndTime(domainOrder.getEndTime());
         }
 //        orderRepo.findByIdAndDelFalse(asset.getOrderId()).ifPresent(order -> asset.setOpened(order.isOpened()));