Browse Source

Merge branch 'dev' of xiongzhu/raex_back into master

wangqifan 3 years ago
parent
commit
a62b5239b8

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

@@ -30,7 +30,7 @@ public interface DomainOrderRepo extends JpaRepository<DomainOrder, Long>, JpaSp
 
     Integer countAllByDomainNameEqualsAndOrderStatusNot(String name, OrderStatus status);
 
-    @Query(value = "select c from DomainOrder c where c.picName like ?1 and c.orderStatus <> ?2")
+    @Query(value = "select c.domainName,c.endTime,c.id from DomainOrder c where c.picName = ?1 and c.orderStatus <> ?2")
     Page<DomainOrder> searchUsedDomain(String name, OrderStatus status, Pageable pageable);
 
     List<DomainOrder> findByOrderStatusAndCreatedAtBeforeAndDelFalse(OrderStatus orderStatus, LocalDateTime createdAt);

+ 1 - 1
src/main/java/com/izouma/nineth/web/DomainOrderController.java

@@ -61,7 +61,7 @@ public class DomainOrderController extends BaseController {
     }
 
     @PostMapping("/topTen")
-    @Cacheable(value = "domainTopTen")
+//    @Cacheable(value = "domainTopTen")
     public List<DomainCountDTO> topTen() {
         return domainOrderService.top20();
     }