Переглянути джерело

Merge branch 'master_fix' of xiongzhu/raex_back into master

wangqifan 3 роки тому
батько
коміт
1f8e87e6d6

+ 7 - 0
src/main/java/com/izouma/nineth/service/DomainOrderService.java

@@ -289,6 +289,13 @@ public class DomainOrderService {
         Pageable pageable = PageRequest.of(0, 3, Sort.by("createdAt").descending());
         List<DomainOrder> used = domainOrderRepo.searchUsedDomain("%" + domain + "%", OrderStatus.CANCELLED, pageable)
                                                 .getContent();
+        DomainOrder first = domainOrderRepo
+                .findFirstByDomainNameAndOrderStatus(domain + ".nft", OrderStatus.FINISH);
+        if (first != null) {
+            if (!used.contains(first)) {
+                used.add(first);
+            }
+        }
 
         String n = domain.substring(domain.length() - 1);
         List<Map<String, Object>> recommend = new ArrayList<>();