|
|
@@ -91,7 +91,7 @@ public class TradeAuctionOrderService {
|
|
|
|
|
|
if (user.getInviteType() != null) {
|
|
|
if (user.getInviteType().equals(InviteType.AUCTION)) {
|
|
|
- tradeAuctionOrder.setInvitor(user.getCollectionInvitor());
|
|
|
+ tradeAuctionOrder.setInvitor(Long.valueOf(user.getInviteCode()));
|
|
|
}
|
|
|
}
|
|
|
tradeAuctionOrder = tradeAuctionOrderRepo.save(tradeAuctionOrder);
|
|
|
@@ -242,8 +242,6 @@ public class TradeAuctionOrderService {
|
|
|
BigDecimal shareRatio = sysConfigService.getBigDecimal("auction_commission_rate");
|
|
|
if (StringUtils.isNotBlank(user.getSettleAccountId()) &&
|
|
|
shareRatio != null && shareRatio.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
- BigDecimal divide = price.multiply(shareRatio)
|
|
|
- .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
|
|
|
commissionRecordRepo.save(CommissionRecord.builder()
|
|
|
.orderId(order.getId())
|
|
|
.collectionId(order.getTradeAuctionId())
|
|
|
@@ -253,11 +251,13 @@ public class TradeAuctionOrderService {
|
|
|
.userId(user.getId())
|
|
|
.shareRatio(user.getShareRatio())
|
|
|
.phone(user.getPhone())
|
|
|
- .shareAmount(divide)
|
|
|
+ .shareAmount(price.multiply(shareRatio)
|
|
|
+ .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP))
|
|
|
.type(InviteType.AUCTION)
|
|
|
.build());
|
|
|
|
|
|
- userBalanceService.addBalance(user.getId(), divide, order
|
|
|
+ userBalanceService.addBalance(user.getId(), price.multiply(shareRatio)
|
|
|
+ .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP), order
|
|
|
.getId(), BalanceType.COMMISSION);
|
|
|
}
|
|
|
});
|