asset

src/main/java/com/izouma/nineth/domain/Asset.java

@@ -7,10 +7,7 @@ import com.izouma.nineth.converter.FileObjectConverter;
 import com.izouma.nineth.converter.FileObjectListConverter;
 import com.izouma.nineth.converter.PrivilegeListConverter;
 import com.izouma.nineth.converter.PropertyListConverter;
-import com.izouma.nineth.enums.AssetSource;
-import com.izouma.nineth.enums.AssetStatus;
-import com.izouma.nineth.enums.CollectionType;
-import com.izouma.nineth.enums.MetaSize;
+import com.izouma.nineth.enums.*;
 import com.izouma.nineth.utils.CollectionTagSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -244,6 +241,27 @@ public class Asset extends CollectionBaseEntity {
     @Transient
     private LocalDateTime endTime;
 
+
+
+    @Transient
+    @ApiModelProperty("是否打开超链")
+    private boolean openHyperLink = false;
+
+    @Transient
+    @ApiModelProperty("超链类型")
+    @Enumerated(EnumType.STRING)
+    private HyperLinkType hyperLinkType;
+
+    @Transient
+    @ApiModelProperty("超链地址")
+    private String address;
+
+    @Transient
+    @ApiModelProperty("当前使用nft域名的人的id")
+    private Long CurrentOwnerId;
+
+
+
     @Transient
     @ApiModelProperty("元宇宙展厅是否上架")
     private boolean metaPutOn;

src/main/java/com/izouma/nineth/domain/Rice.java

@@ -81,7 +81,7 @@ public class Rice extends BaseEntity {
     private Long numberOfActivity= 0L;
 
 
-    @ApiModelProperty("水滴之活动")
+    @ApiModelProperty("今日用户获得积分")
     private Long earnPointsEveryDay= 0L;
 
 

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

@@ -758,7 +758,7 @@ public class RiceService {
                         break;
                     }
                 }
-                // 如果 counts 不在任何范围内，则默认的 score 值是最后一个对象中的 score 值
+
                 if (!(defaultScore == 0 && jsonArray.size() > 0)) {
                     rice.setSelfScore(rice.getSelfScore() + defaultScore);
                     rice.setEarnPointsEveryDay(rice.getEarnPointsEveryDay()+defaultScore);

src/main/java/com/izouma/nineth/web/AssetController.java

@@ -113,6 +113,10 @@ public class AssetController extends BaseController {
             DomainOrder domainOrder = domainOrderRepo
                     .findFirstByDomainNameAndOrderStatus(domainName, OrderStatus.FINISH);
             asset.setEndTime(domainOrder.getEndTime());
+            asset.setOpenHyperLink(domainOrder.isOpenHyperLink());
+            asset.setHyperLinkType(domainOrder.getHyperLinkType());
+            asset.setAddress(domainOrder.getAddress());
+            asset.setCurrentOwnerId(domainOrder.getCurrentOwnerId());
         }
 //        orderRepo.findByIdAndDelFalse(asset.getOrderId()).ifPresent(order -> asset.setOpened(order.isOpened()));
         return asset;

src/test/java/com/izouma/nineth/service/OrderServiceTest.java

@@ -328,7 +328,7 @@ public class OrderServiceTest {
     @Test
     public void test11() {
 
-        orderService.notifyOrder(1093887582653128704L,PayMethod.BALANCE,"565615");
+        orderService.notifyOrder(1093891755176108032L,PayMethod.BALANCE,"565615");
     }
 
     @Test