licailing пре 4 година
родитељ
комит
6dc1c50c43

+ 14 - 14
src/main/java/com/izouma/nineth/service/AirDropService.java

@@ -70,13 +70,13 @@ public class AirDropService {
                                     collection.getHoldDays());
                         } else {
                             //查看有无vip权限
-//                            CollectionPrivilege collectionPrivilege = collectionPrivilegeRepo.findByCollectionId(record.getCollectionId());
-//                            if (ObjectUtils.isNotEmpty(collectionPrivilege)) {
-//                                if (collectionPrivilege.isVip()) {
-//                                    //更新vip信息
-//                                    userRepo.updateVipPurchase(user.getId(), 1);
-//                                }
-//                            }
+                            CollectionPrivilege collectionPrivilege = collectionPrivilegeRepo.findByCollectionId(record.getCollectionId());
+                            if (ObjectUtils.isNotEmpty(collectionPrivilege)) {
+                                if (collectionPrivilege.isVip()) {
+                                    //更新vip信息
+                                    userRepo.updateVipPurchase(user.getId(), 1);
+                                }
+                            }
                             assetService.createAsset(winItem, user, null, null, "空投",
                                     collectionService.getNextNumber(winItem.getCollectionId()), collection.getHoldDays());
                         }
@@ -86,13 +86,13 @@ public class AirDropService {
                                     collection.getTotal() > 1 ? collectionService.getNextNumber(collection.getId()) : null);
                         } else {
                             //查看有无vip权限
-//                            CollectionPrivilege collectionPrivilege = collectionPrivilegeRepo.findByCollectionId(record.getCollectionId());
-//                            if (ObjectUtils.isNotEmpty(collectionPrivilege)) {
-//                                if (collectionPrivilege.isVip()) {
-//                                    //更新vip信息
-//                                    userRepo.updateVipPurchase(user.getId(), 1);
-//                                }
-//                            }
+                            CollectionPrivilege collectionPrivilege = collectionPrivilegeRepo.findByCollectionId(record.getCollectionId());
+                            if (ObjectUtils.isNotEmpty(collectionPrivilege)) {
+                                if (collectionPrivilege.isVip()) {
+                                    //更新vip信息
+                                    userRepo.updateVipPurchase(user.getId(), 1);
+                                }
+                            }
                             Asset asset = assetService.createAsset(collection, user, null, null, "空投", collectionService.getNextNumber(collection.getId()));
                             //创建展厅
                             if (collection.getType() == CollectionType.SHOWROOM) {

+ 8 - 8
src/main/java/com/izouma/nineth/service/AssetService.java

@@ -346,14 +346,14 @@ public class AssetService {
         }
 
         //vip权限转让
-//        CollectionPrivilege collectionPrivilege = collectionPrivilegeRepo.findByCollectionId(asset.getCollectionId());
-//        if (ObjectUtils.isNotEmpty(collectionPrivilege)) {
-//            if (collectionPrivilege.isVip()) {
-//                //更新vip信息
-//                userRepo.updateVipPurchase(toUser.getId(), 1);
-//                userRepo.updateVipPurchase(asset.getUserId(), 0);
-//            }
-//        }
+        CollectionPrivilege collectionPrivilege = collectionPrivilegeRepo.findByCollectionId(asset.getCollectionId());
+        if (ObjectUtils.isNotEmpty(collectionPrivilege)) {
+            if (collectionPrivilege.isVip()) {
+                //更新vip信息
+                userRepo.updateVipPurchase(toUser.getId(), 1);
+                userRepo.updateVipPurchase(asset.getUserId(), 0);
+            }
+        }
     }
 
     public List<TokenHistory> tokenHistory(String tokenId, Long assetId) {

+ 15 - 14
src/main/java/com/izouma/nineth/service/OrderService.java

@@ -608,13 +608,14 @@ public class OrderService {
                     orderRepo.save(order);
 
                     //藏品其他信息/是否vip
-//                    CollectionPrivilege collectionPrivilege = collectionPrivilegeRepo.findByCollectionId(order.getCollectionId());
-//                    if (ObjectUtils.isNotEmpty(collectionPrivilege)) {
-//                        if (collectionPrivilege.isVip()) {
-//                            //更新vip信息
-//                            userRepo.updateVipPurchase(order.getUserId(), 1);
-//                        }
-//                    }
+                    CollectionPrivilege collectionPrivilege = collectionPrivilegeRepo.findByCollectionId(order.getCollectionId());
+                    if (ObjectUtils.isNotEmpty(collectionPrivilege)) {
+                        if (collectionPrivilege.isVip()) {
+                            //更新vip信息
+                            userRepo.updateVipPurchase(order.getUserId(), 1);
+                        }
+                    }
+
                     assetService.createAsset(winItem, user, order.getId(), order.getPrice(), "出售",
                             winItem.getTotal() > 1 ? collectionService.getNextNumber(winItem.getCollectionId()) : null,
                             collection.getHoldDays());
@@ -637,13 +638,13 @@ public class OrderService {
                     } else {
                         orderRepo.save(order);
                         //藏品其他信息/是否vip
-//                        CollectionPrivilege collectionPrivilege = collectionPrivilegeRepo.findByCollectionId(order.getCollectionId());
-//                        if (ObjectUtils.isNotEmpty(collectionPrivilege)) {
-//                            if (collectionPrivilege.isVip()) {
-//                                //更新vip信息
-//                                userRepo.updateVipPurchase(order.getUserId(), 1);
-//                            }
-//                        }
+                        CollectionPrivilege collectionPrivilege = collectionPrivilegeRepo.findByCollectionId(order.getCollectionId());
+                        if (ObjectUtils.isNotEmpty(collectionPrivilege)) {
+                            if (collectionPrivilege.isVip()) {
+                                //更新vip信息
+                                userRepo.updateVipPurchase(order.getUserId(), 1);
+                            }
+                        }
                         Asset asset = assetService.createAsset(collection, user, order.getId(), order.getPrice(), "出售",
                                 collection.getTotal() > 1 ? collectionService.getNextNumber(order.getCollectionId()) : null);