|
|
@@ -289,10 +289,11 @@ public class OrderService {
|
|
|
Asset asset = assetRepo.findById(collection.getAssetId()).orElseThrow(new BusinessException("无记录"));
|
|
|
User owner = userRepo.findById(asset.getUserId()).orElseThrow(new BusinessException("拥有者用户不存在"));
|
|
|
if (collection.getServiceCharge() + collection.getRoyalties() > 0) {
|
|
|
- restAmount = divMoney(totalAmount, restAmount, divMembers, "0",
|
|
|
- collection.getServiceCharge() + collection.getRoyalties(), true);
|
|
|
+ // 扣除手续费、服务费、GAS费
|
|
|
+ restAmount = divMoney(totalAmount, restAmount, divMembers, owner.getMemberId(),
|
|
|
+ 100 - (collection.getServiceCharge() + collection.getRoyalties()), false);
|
|
|
}
|
|
|
- restAmount = divMoney(restAmount, divMembers, owner.getMemberId(), restAmount, false);
|
|
|
+ restAmount = divMoney(restAmount, divMembers, owner.getMemberId(), restAmount, true);
|
|
|
} else {
|
|
|
if (invitor != null && invitor.getShareRatio() != null
|
|
|
&& invitor.getShareRatio().compareTo(BigDecimal.ZERO) > 0) {
|