@@ -89,10 +89,10 @@ public class Asset extends CollectionBaseEntity {
private boolean canResale;
@ApiModelProperty("版税比例")
- private int royalties;
+ private double royalties;
@ApiModelProperty("手续费比例")
- private int serviceCharge;
+ private double serviceCharge;
@ApiModelProperty("铸造者")
@Searchable
@@ -104,10 +104,10 @@ public class AuctionActivity extends BaseEntity {
private AuctionSource source;
@Column(columnDefinition = "int(11) default 0")
@ApiModelProperty("围观次数")
@@ -43,10 +43,10 @@ public class AuctionOrder extends BaseEntityNoID {
private List<FileObject> pic;
@Enumerated(EnumType.STRING)
@ApiModelProperty("拍卖类型")
@@ -137,10 +137,10 @@ public class Collection extends CollectionBaseEntity {
@ApiModelProperty("分类")
private String category;
@@ -112,10 +112,10 @@ public class Order extends BaseEntityNoID {
@ApiModelProperty("类型")
@@ -861,7 +861,7 @@ public class AssetService {
userRepo.addDestroyPoint(userId, 1);
}
- public int getRoyalties(Long minterId, int royalties, Long userId) {
+ public double getRoyalties(Long minterId, double royalties, Long userId) {
if (royalties == 3) {
return 3;
@@ -641,7 +641,7 @@ public class OrderService {
public static BigDecimal divMoney(BigDecimal totalAmount, BigDecimal restAmount, List<Map<String, Object>> divMembers,
- String memberId, int ratio, boolean feeFlag) {
+ String memberId, double ratio, boolean feeFlag) {
if (ratio == -1 || (ratio > 0 && ratio < 100)) {
BigDecimal divAmount = ratio == -1 ? restAmount :
totalAmount.multiply(BigDecimal.valueOf(ratio))
@@ -214,7 +214,7 @@ public class AssetController extends BaseController {
@PostMapping("/getRoyalties")
- public int getRoyalties(@RequestParam Long id) {
+ public double getRoyalties(@RequestParam Long id) {
Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
return assetService.getRoyalties(asset.getMinterId(), asset.getRoyalties(), SecurityUtils.getAuthenticatedUser()
.getId());