|
|
@@ -103,7 +103,8 @@ public class AssetController extends BaseController {
|
|
|
Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
|
|
|
if (asset.getType().equals(CollectionType.DOMAIN)) {
|
|
|
String domainName = asset.getName().substring(9);
|
|
|
- DomainOrder domainOrder = domainOrderRepo.findFirstByDomainNameAndOrderStatus(domainName, OrderStatus.FINISH);
|
|
|
+ DomainOrder domainOrder = domainOrderRepo
|
|
|
+ .findFirstByDomainNameAndOrderStatus(domainName, OrderStatus.FINISH);
|
|
|
asset.setEndTime(domainOrder.getEndTime());
|
|
|
}
|
|
|
// orderRepo.findByIdAndDelFalse(asset.getOrderId()).ifPresent(order -> asset.setOpened(order.isOpened()));
|
|
|
@@ -250,6 +251,9 @@ public class AssetController extends BaseController {
|
|
|
@PostMapping("/getRoyalties")
|
|
|
public double getRoyalties(@RequestParam Long id) {
|
|
|
Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
|
|
|
+ if (asset.getType().equals(CollectionType.DOMAIN)) {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
return assetService.getRoyalties(asset.getMinterId(), asset.getRoyalties(), SecurityUtils.getAuthenticatedUser()
|
|
|
.getId());
|
|
|
}
|