bug修复

src/main/java/com/izouma/nineth/service/DomainOrderService.java

@@ -6,7 +6,6 @@ import com.google.zxing.WriterException;
 import com.izouma.nineth.config.GeneralProperties;
 import com.izouma.nineth.config.RedisKeys;
 import com.izouma.nineth.domain.Asset;
-import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.DomainOrder;
 import com.izouma.nineth.domain.FileObject;
 import com.izouma.nineth.domain.User;
@@ -17,7 +16,10 @@ import com.izouma.nineth.dto.nftdomain.DomainTop;
 import com.izouma.nineth.enums.*;
 import com.izouma.nineth.event.OrderNotifyEvent;
 import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.*;
+import com.izouma.nineth.repo.AssetRepo;
+import com.izouma.nineth.repo.DomainOrderRepo;
+import com.izouma.nineth.repo.OrderRepo;
+import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.service.storage.StorageService;
 import com.izouma.nineth.utils.ImageUtils;
 import com.izouma.nineth.utils.JpaUtils;
@@ -74,7 +76,6 @@ public class DomainOrderService {
     private GeneralProperties             generalProperties;
     private RocketMQTemplate              rocketMQTemplate;
     private OrderRepo                     orderRepo;
-    private CollectionRepo                collectionRepo;
 
     public Page<DomainOrder> all(PageQuery pageQuery) {
         return domainOrderRepo
@@ -311,34 +312,30 @@ public class DomainOrderService {
         used.forEach(domainOrder -> {
             Map<String, Object> sold = new HashMap<>();
             if (!domainOrder.getDomainName().contains(".uni")) {
-                Collection collection = collectionRepo
-                        .findFirstByNameAndOnShelf("RID元宇宙域名 " + domainOrder.getDomainName(), true);
-                if (collection != null) {
-                    if (collection.isSalable()) {
-                        sold.put("canAsk", true);
-                    } else {
+                Asset asset = assetRepo
+                        .findFirstByNameAndStatus("RID元宇宙域名 " + domainOrder.getDomainName(), AssetStatus.NORMAL);
+                if (asset != null) {
+                    if (asset.isConsignment()) {
                         sold.put("canAsk", false);
+                        sold.put("collectionId", asset.getPublicCollectionId());
+                    } else {
+                        sold.put("canAsk", true);
+                    }
+                    sold.put("id", domainOrder.getId());
+                    sold.put("domain", domainOrder.getDomainName().toLowerCase());
+                    sold.put("endTime", domainOrder.getEndTime());
+                    sold.put("sold", true);
+                    sold.put("isOpenHyperLink", domainOrder.isOpenHyperLink());
+                    if (domainOrder.getHyperLinkType() != null) {
+                        sold.put("HyperLinkType", domainOrder.getHyperLinkType());
+                    }
+                    if (domainOrder.getAddress() != null) {
+                        sold.put("Address", domainOrder.getAddress());
                     }
-                    sold.put("collectionId", collection.getId());
-                } else {
-                    sold.put("canAsk", true);
-                }
-                sold.put("id", domainOrder.getId());
-                sold.put("domain", domainOrder.getDomainName().toLowerCase());
-                sold.put("endTime", domainOrder.getEndTime());
-                sold.put("sold", true);
-                sold.put("isOpenHyperLink", domainOrder.isOpenHyperLink());
-                if (domainOrder.getHyperLinkType() != null) {
-                    sold.put("HyperLinkType", domainOrder.getHyperLinkType());
-                }
-                if (domainOrder.getAddress() != null) {
-                    sold.put("Address", domainOrder.getAddress());
-                }
 
-                result.add(sold);
+                    result.add(sold);
+                }
             }
-
-
         });
         return result;
     }