wangqifan hace 3 años
padre
commit
fdb0039308

+ 2 - 0
src/main/java/com/izouma/nineth/repo/CollectionRepo.java

@@ -221,6 +221,8 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
 
     Collection findFirstByNameAndSalableAndOnShelf(String name, boolean salable, boolean onshelf);
 
+    Collection findFirstByNameAndOnShelf(String name, boolean onshelf);
+
     @Query(nativeQuery = true, value = "update collection_info c set c.hold_days = null where c.name like ?1")
     @Modifying
     @Transactional

+ 6 - 2
src/main/java/com/izouma/nineth/service/DomainOrderService.java

@@ -312,9 +312,13 @@ public class DomainOrderService {
             Map<String, Object> sold = new HashMap<>();
             if (!domainOrder.getDomainName().contains(".uni")) {
                 Collection collection = collectionRepo
-                        .findFirstByNameAndSalableAndOnShelf("RID元宇宙域名 " + domainOrder.getDomainName(), true, true);
+                        .findFirstByNameAndOnShelf("RID元宇宙域名 " + domainOrder.getDomainName(), true);
                 if (collection != null) {
-                    sold.put("canAsk", false);
+                    if (collection.isSalable()) {
+                        sold.put("canAsk", true);
+                    } else {
+                        sold.put("canAsk", false);
+                    }
                     sold.put("collectionId", collection.getId());
                 } else {
                     sold.put("canAsk", true);