开盲盒bug

(cherry picked from commit b344a1c614692f6780c4fb1e8e47627c8162a2bc)

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")
@@ -189,19 +189,20 @@ 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")
     public int getRoyalties(@RequestParam Long id) {
         Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-        return assetService.getRoyalties(asset.getMinterId(), asset.getRoyalties(), SecurityUtils.getAuthenticatedUser().getId());
+        return assetService.getRoyalties(asset.getMinterId(), asset.getRoyalties(), SecurityUtils.getAuthenticatedUser()
+                .getId());
     }
 }
 

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

@@ -9,6 +9,7 @@ import com.izouma.nineth.enums.CollectionType;
 import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.enums.PayMethod;
 import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.OrderRepo;
 import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.service.OrderService;
@@ -40,6 +41,7 @@ public class OrderController extends BaseController {
     private OrderService orderService;
     private OrderRepo    orderRepo;
     private UserRepo     userRepo;
+    private AssetRepo    assetRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
 //    @PostMapping("/save")
@@ -151,6 +153,10 @@ public class OrderController extends BaseController {
         orderRepo.findById(id).ifPresent(order -> {
             order.setOpened(true);
             orderRepo.save(order);
+            assetRepo.findById(order.getAssetId()).ifPresent(asset -> {
+                asset.setOpened(true);
+                assetRepo.save(asset);
+            });
         });
     }