|
|
@@ -57,6 +57,7 @@ public class TradeAuctionOrderService {
|
|
|
.serviceCharge(serviceCharge)
|
|
|
.name(tradeAuction.getName())
|
|
|
.nickname(user.getNickname())
|
|
|
+ .paymentType(AuctionPaymentType.DEPOSIT)
|
|
|
.userId(user.getId())
|
|
|
.originPrice(tradeAuction.getPrice())
|
|
|
.currentPrice(tradeAuction.getCurrentPrice())
|
|
|
@@ -88,6 +89,7 @@ public class TradeAuctionOrderService {
|
|
|
.add(tradeAuction.getCurrentPrice().subtract(tradeAuction.getPrice()));
|
|
|
TradeAuctionOrder tradeAuctionOrder = TradeAuctionOrder.builder()
|
|
|
.tradeAuctionId(tradeAuction.getId())
|
|
|
+ .paymentType(AuctionPaymentType.FIXED_PRICE)
|
|
|
.earnedPrice(price.subtract(tradeAuction.getPrice()))
|
|
|
.serviceCharge(serviceCharge)
|
|
|
.name(tradeAuction.getName())
|
|
|
@@ -129,6 +131,7 @@ public class TradeAuctionOrderService {
|
|
|
.divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
|
|
|
tradeAuction.setNextPrice(result);
|
|
|
tradeAuction.setEarning(result.subtract(tradeAuction.getPrice()));
|
|
|
+ tradeAuction.setCommission(tradeAuctionOrder.getServiceCharge());
|
|
|
tradeAuction.setStatus(TradeAuctionStatus.WAITING);
|
|
|
tradeAuction.setCurrentPrice(tradeAuctionOrder.getCurrentPrice());
|
|
|
tradeAuction.setCurrentOwner(tradeAuctionOrder.getNickname());
|
