|
@@ -870,8 +870,8 @@ public class AssetService {
|
|
|
userRepo.addDestroyPoint(userId, 1);
|
|
userRepo.addDestroyPoint(userId, 1);
|
|
|
}
|
|
}
|
|
|
public double getRoyalties(Long minterId, double royalties, Long userId) {
|
|
public double getRoyalties(Long minterId, double royalties, Long userId) {
|
|
|
- if (royalties == 3) {
|
|
|
|
|
- return 3;
|
|
|
|
|
|
|
+ if (royalties == 2) {
|
|
|
|
|
+ return 2;
|
|
|
}
|
|
}
|
|
|
LongArrayConverter converter = new LongArrayConverter();
|
|
LongArrayConverter converter = new LongArrayConverter();
|
|
|
String discountMinter = sysConfigService.getString("discount_minter");
|
|
String discountMinter = sysConfigService.getString("discount_minter");
|
|
@@ -881,7 +881,7 @@ public class AssetService {
|
|
|
List<Long> collectionIds = converter.convertToEntityAttribute(discountCollection);
|
|
List<Long> collectionIds = converter.convertToEntityAttribute(discountCollection);
|
|
|
Long assetId = assetRepo.findDiscount(userId, collectionIds);
|
|
Long assetId = assetRepo.findDiscount(userId, collectionIds);
|
|
|
if (ObjectUtils.isNotEmpty(assetId)) {
|
|
if (ObjectUtils.isNotEmpty(assetId)) {
|
|
|
- return 3;
|
|
|
|
|
|
|
+ return 2;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return royalties;
|
|
return royalties;
|