开放锁单

src/main/java/com/izouma/nineth/repo/nftdomain/DomainAskRepo.java

@@ -26,8 +26,8 @@ public interface DomainAskRepo extends JpaRepository<DomainAsk, Long>, JpaSpecif
     @Query(nativeQuery = true, value = "select price from domain_ask where domain_order_id = ?1 and status = 'ASKING' order by price desc limit 1")
     BigDecimal findMaxPrice(Long domainOrderId);
 
-    @Query(nativeQuery = true, value = "select count(da.id) count,da.pic_url pic,da.domain_order_id domainOrderId,a.id assetId,da.`name` picName,da.end_time endTime from domain_ask da inner join asset a on a.id = da.asset_id where da.status = 'ASKING' and da.owner_id = ?1 and a.status = 'NORMAL' group by da.asset_id order by a.created_at desc ")
-    List<Map<String, Object>> askGroup(Long userId);
+    @Query(nativeQuery = true, value = "select count(da.id) count,da.pic_url pic,da.domain_order_id domainOrderId,a.id assetId,da.`name` picName,da.end_time endTime from domain_ask da inner join asset a on a.id = da.asset_id where da.status in ?1 and da.owner_id = ?2 and a.status = 'NORMAL' group by da.asset_id order by a.created_at desc ")
+    List<Map<String, Object>> askGroup(Set<DomainAskStatus> domainAsks, Long userId);
 
     int countByAssetIdAndUserIdAndStatusInAndDelFalse(Long assetId, Long userId, Set<DomainAskStatus> statuses);
 

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

@@ -316,6 +316,7 @@ public class DomainOrderService {
                         .findFirstByNameAndStatus("RID元宇宙域名 " + domainOrder.getDomainName(), AssetStatus.NORMAL);
                 if (asset != null) {
                     if (asset.isConsignment()) {
+                        sold.put("collectionId", asset.getPublicCollectionId());
                         sold.put("canAsk", false);
                     } else {
                         sold.put("canAsk", true);
@@ -632,8 +633,10 @@ public class DomainOrderService {
 
     public void addHyperLink(Long collectionId, boolean openHyperLink, HyperLinkType hyperLinkType, String address) {
         // Collection collection = collectionRepo.findById(collectionId).orElseThrow(new BusinessException("没找到记录"));
-        Asset asset = assetRepo.findByIdAndStatus(collectionId, AssetStatus.NORMAL).orElseThrow(new BusinessException("没找到记录"));
-        DomainOrder domainOrder = domainOrderRepo.findById(asset.getCollectionId()).orElseThrow(new BusinessException("没找到记录"));
+        Asset asset = assetRepo.findByIdAndStatus(collectionId, AssetStatus.NORMAL)
+                               .orElseThrow(new BusinessException("没找到记录"));
+        DomainOrder domainOrder = domainOrderRepo.findById(asset.getCollectionId())
+                                                 .orElseThrow(new BusinessException("没找到记录"));
         domainOrder.setOpenHyperLink(openHyperLink);
         domainOrder.setHyperLinkType(hyperLinkType);
         domainOrder.setAddress(address);

src/main/java/com/izouma/nineth/service/nftdomain/DomainAskService.java

@@ -100,7 +100,11 @@ public class DomainAskService {
 
     public List<Map<String, Object>> getGroups() {
         Long userId = SecurityUtils.getAuthenticatedUser().getId();
-        return domainAskRepo.askGroup(userId);
+        Set<DomainAskStatus> domainAskStatuses = new HashSet<>();
+        domainAskStatuses.add(DomainAskStatus.ASKING);
+        domainAskStatuses.add(DomainAskStatus.REFUNDED);
+        domainAskStatuses.add(DomainAskStatus.SUCCESS);
+        return domainAskRepo.askGroup(domainAskStatuses, userId);
     }
 
     public void cancel(DomainAsk domainAsk) {