“xubinhui %!s(int64=2) %!d(string=hai) anos
pai
achega
535baf75dc

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

@@ -15,6 +15,7 @@ import javax.transaction.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 public interface DomainOrderRepo extends JpaRepository<DomainOrder, Long>, JpaSpecificationExecutor<DomainOrder> {
     @Query("update DomainOrder t set t.del = true where t.id = ?1")
@@ -22,8 +23,9 @@ public interface DomainOrderRepo extends JpaRepository<DomainOrder, Long>, JpaSp
     @Transactional
     void softDelete(Long id);
 
-    @Query(value="SELECT * FROM domain_order WHERE current_owner_id = :currentOwnerId AND open_hyper_link = true", nativeQuery = true)
-    List<DomainOrder> findAllByCurrentOwnerIdAndOpenHyperLinkIsTrue(Long currentOwnerId);
+    //@Query(value="SELECT * FROM domain_order WHERE current_owner_id = :currentOwnerId AND open_hyper_link = true", nativeQuery = true)
+    @Query(value="SELECT a.id as assetId,do.domain_name,do.address,do.hyper_link_type,do.open_hyper_link,do.current_owner_id from domain_order do LEFT JOIN asset  a on do.id=a.collection_id WHERE a.`status`='NORMAL' and do.open_hyper_link = 1 and do.current_owner_id = :currentOwnerId", nativeQuery = true)
+    List<Map<String, Object>> findAllByCurrentOwnerIdAndOpenHyperLinkIsTrue(Long currentOwnerId);
 
     DomainOrder findByDomainNameAndOrderStatus(String domainName,OrderStatus orderStatus);
 

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

@@ -1,7 +1,6 @@
 package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.Asset;
-import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.DomainOrder;
 import com.izouma.nineth.dto.excel.DomainCountDTO;
 import com.izouma.nineth.dto.nftdomain.DomainResult;
@@ -9,7 +8,6 @@ import com.izouma.nineth.dto.nftdomain.DomainTop;
 import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.enums.AuthorityName;
 import com.izouma.nineth.enums.HyperLinkType;
-import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.CollectionRepo;
 import com.izouma.nineth.service.DomainOrderService;
@@ -136,8 +134,9 @@ public class DomainOrderController extends BaseController {
 
     //我的超链
     @GetMapping("/showMyHyperLink")
-    public List<DomainOrder>  showMyHyperLink(){
-     return domainOrderRepo.findAllByCurrentOwnerIdAndOpenHyperLinkIsTrue(SecurityUtils.getAuthenticatedUser().getId());
+    public List<Map<String, Object>> showMyHyperLink(){
+        List<Map<String, Object>> allByCurrentOwnerIdAndOpenHyperLinkIsTrue = domainOrderRepo.findAllByCurrentOwnerIdAndOpenHyperLinkIsTrue(SecurityUtils.getAuthenticatedUser().getId());
+        return allByCurrentOwnerIdAndOpenHyperLinkIsTrue;
     }