|
@@ -280,6 +280,7 @@ public class UserService {
|
|
|
if (StringUtils.isBlank(name)) {
|
|
if (StringUtils.isBlank(name)) {
|
|
|
name = "0x" + RandomStringUtils.randomAlphabetic(8);
|
|
name = "0x" + RandomStringUtils.randomAlphabetic(8);
|
|
|
}
|
|
}
|
|
|
|
|
+ Long airDropCollectionId = collectionId;
|
|
|
Invite invite = null;
|
|
Invite invite = null;
|
|
|
if (StringUtils.isNotBlank(inviteCode)) {
|
|
if (StringUtils.isNotBlank(inviteCode)) {
|
|
|
invite = inviteRepo.findFirstByCode(inviteCode).orElse(null);
|
|
invite = inviteRepo.findFirstByCode(inviteCode).orElse(null);
|
|
@@ -347,15 +348,15 @@ public class UserService {
|
|
|
showroomRepo.addHeatAndRegister(showroomId, weight, 1);
|
|
showroomRepo.addHeatAndRegister(showroomId, weight, 1);
|
|
|
}
|
|
}
|
|
|
//如果collectionId是设定的且invitor为空
|
|
//如果collectionId是设定的且invitor为空
|
|
|
- if (collectionId != null) {
|
|
|
|
|
|
|
+ if (airDropCollectionId != null) {
|
|
|
long MMC_collection_id = sysConfigService.getInt("MMC_collection_id");
|
|
long MMC_collection_id = sysConfigService.getInt("MMC_collection_id");
|
|
|
- if (collectionId == MMC_collection_id) {
|
|
|
|
|
|
|
+ if (airDropCollectionId == MMC_collection_id) {
|
|
|
airDropService.create(AirDrop.builder()
|
|
airDropService.create(AirDrop.builder()
|
|
|
.name("MMC注册空投奖励空投")
|
|
.name("MMC注册空投奖励空投")
|
|
|
.remark(user.getId().toString())
|
|
.remark(user.getId().toString())
|
|
|
.type(AirDropType.asset)
|
|
.type(AirDropType.asset)
|
|
|
.userIds(Collections.singletonList(user.getId()))
|
|
.userIds(Collections.singletonList(user.getId()))
|
|
|
- .collectionId(collectionId)
|
|
|
|
|
|
|
+ .collectionId(airDropCollectionId)
|
|
|
.targets(Collections
|
|
.targets(Collections
|
|
|
.singletonList(new DropTarget(user.getId(), user
|
|
.singletonList(new DropTarget(user.getId(), user
|
|
|
.getPhone(), user.getNickname(), 1)))
|
|
.getPhone(), user.getNickname(), 1)))
|