open asset

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

@@ -64,17 +64,17 @@ public class AssetService {
     public Page<Asset> all(PageQuery pageQuery) {
         Page<Asset> all = assetRepo
                 .findAll(JpaUtils.toSpecification(pageQuery, Asset.class), JpaUtils.toPageRequest(pageQuery));
-        Map<String, Object> query = pageQuery.getQuery();
-        if (query.containsKey("userId")) {
-            List<Long> orderId = orderRepo
-                    .findAllByUserIdAndOpenedFalse(Convert.convert(Long.class, query.get("userId")));
-            return all.map(asset -> {
-                if (orderId.contains(asset.getOrderId())) {
-                    asset.setOpened(false);
-                }
-                return asset;
-            });
-        }
+//        Map<String, Object> query = pageQuery.getQuery();
+//        if (query.containsKey("userId")) {
+//            List<Long> orderId = orderRepo
+//                    .findAllByUserIdAndOpenedFalse(Convert.convert(Long.class, query.get("userId")));
+//            return all.map(asset -> {
+//                if (orderId.contains(asset.getOrderId())) {
+//                    asset.setOpened(false);
+//                }
+//                return asset;
+//            });
+//        }
         return all;
     }
 

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

@@ -35,11 +35,11 @@ import java.util.concurrent.ExecutionException;
 @RequestMapping("/asset")
 @AllArgsConstructor
 public class AssetController extends BaseController {
-    private AssetService     assetService;
-    private AssetRepo        assetRepo;
+    private AssetService assetService;
+    private AssetRepo assetRepo;
     private GiftOrderService giftOrderService;
-    private OrderRepo        orderRepo;
-    private CacheService     cacheService;
+    private OrderRepo orderRepo;
+    private CacheService cacheService;
 
     //@PreAuthorize("hasRole('ADMIN')")
 //    @PostMapping("/save")
@@ -65,7 +65,7 @@ public class AssetController extends BaseController {
     @JsonView(Asset.View.Basic.class)
     public Asset get(@PathVariable Long id) {
         Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-        orderRepo.findByIdAndDelFalse(asset.getOrderId()).ifPresent(order -> asset.setOpened(order.isOpened()));
+//        orderRepo.findByIdAndDelFalse(asset.getOrderId()).ifPresent(order -> asset.setOpened(order.isOpened()));
         return asset;
     }
 
@@ -189,13 +189,13 @@ public class AssetController extends BaseController {
             return;
         }
         Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无盲盒"));
-//        if (!SecurityUtils.getAuthenticatedUser().getId().equals(asset.getUserId())) {
-//            return;
-//        }
-//        if (!asset.isOpened() && CollectionType.BLIND_BOX.equals(asset.getType())) {
-        asset.setOpened(true);
-        assetRepo.save(asset);
-//        }
+        if (!SecurityUtils.getAuthenticatedUser().getId().equals(asset.getUserId())) {
+            return;
+        }
+        if (!asset.isOpened() && CollectionType.BLIND_BOX.equals(asset.getType())) {
+            asset.setOpened(true);
+            assetRepo.save(asset);
+        }
     }
 
     @PostMapping("/getRoyalties")