wangqifan 3 年之前
父节点
当前提交
d19c7a5ad5
共有 1 个文件被更改,包括 15 次插入13 次删除
  1. 15 13
      src/main/java/com/izouma/nineth/service/UserService.java

+ 15 - 13
src/main/java/com/izouma/nineth/service/UserService.java

@@ -347,19 +347,21 @@ public class UserService {
             showroomRepo.addHeatAndRegister(showroomId, weight, 1);
         }
         //如果collectionId是设定的且invitor为空
-        if (user.getCollectionId().equals((long) sysConfigService.getInt("MMC_collection_id"))) {
-            airDropService.create(AirDrop.builder()
-                                         .name("MMC注册空投奖励空投")
-                                         .remark(user.getId().toString())
-                                         .type(AirDropType.asset)
-                                         .userIds(Collections.singletonList(user.getId()))
-                                         .collectionId(user.getCollectionId())
-                                         .targets(Collections
-                                                 .singletonList(new DropTarget(user.getId(), user
-                                                         .getPhone(), user.getNickname(), 1)))
-                                         .auto(true)
-                                         .companyId(1L)
-                                         .build());
+        if (collectionId != null) {
+            if (collectionId.equals((long) sysConfigService.getInt("MMC_collection_id"))) {
+                airDropService.create(AirDrop.builder()
+                                             .name("MMC注册空投奖励空投")
+                                             .remark(user.getId().toString())
+                                             .type(AirDropType.asset)
+                                             .userIds(Collections.singletonList(user.getId()))
+                                             .collectionId(collectionId)
+                                             .targets(Collections
+                                                     .singletonList(new DropTarget(user.getId(), user
+                                                             .getPhone(), user.getNickname(), 1)))
+                                             .auto(true)
+                                             .companyId(1L)
+                                             .build());
+            }
         }
         return user;
     }