补开盲盒

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

@@ -155,7 +155,7 @@ public class Asset extends BaseEntity {
     private CollectionType type;
 
     @Transient
-    private boolean opened;
+    private boolean opened = true;
 
     public static Asset create(Collection collection, User user) {
         return Asset.builder()

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

@@ -198,7 +198,7 @@ public class Order {
 
     private Long invitor;
 
-    private boolean opened = true;
+    private boolean opened;
 
     @JsonProperty("createdAt")
     public LocalDateTime getCreatedAt() {

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

@@ -7,7 +7,7 @@ import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.dto.UserHistory;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.AssetRepo;
-import com.izouma.nineth.repo.TokenHistoryRepo;
+import com.izouma.nineth.repo.OrderRepo;
 import com.izouma.nineth.service.AssetService;
 import com.izouma.nineth.service.GiftOrderService;
 import com.izouma.nineth.utils.ObjUtils;
@@ -16,7 +16,6 @@ import com.izouma.nineth.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -32,7 +31,7 @@ public class AssetController extends BaseController {
     private AssetService     assetService;
     private AssetRepo        assetRepo;
     private GiftOrderService giftOrderService;
-    private TokenHistoryRepo tokenHistoryRepo;
+    private OrderRepo        orderRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -54,7 +53,9 @@ public class AssetController extends BaseController {
 
     @GetMapping("/get/{id}")
     public Asset get(@PathVariable Long id) {
-        return assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        orderRepo.findByIdAndDelFalse(asset.getOrderId()).ifPresent(order -> asset.setOpened(order.isOpened()));
+        return asset;
     }
 
     @PostMapping("/del/{id}")

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

@@ -3,6 +3,7 @@ package com.izouma.nineth.service;
 import com.izouma.nineth.ApplicationTests;
 import com.izouma.nineth.TokenHistory;
 import com.izouma.nineth.domain.*;
+import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.*;
 import org.apache.commons.lang3.StringUtils;
@@ -10,6 +11,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
+import java.util.Map;
 
 class AssetServiceTest extends ApplicationTests {
     @Autowired
@@ -125,4 +127,14 @@ class AssetServiceTest extends ApplicationTests {
         System.out.println(builder);
     }
 
+    @Test
+    public void all() {
+        PageQuery pageQuery = new PageQuery();
+        Map<String, Object> query = pageQuery.getQuery();
+        query.put("userId", 9850);
+        assetService.all(pageQuery)
+                .getContent()
+                .forEach(asset -> System.out.println(asset.getId() + "->" + asset.isOpened()));
+    }
+
 }