|
@@ -13,6 +13,7 @@ import com.izouma.nineth.repo.AuctionActivityRepo;
|
|
|
import com.izouma.nineth.repo.AuctionRecordRepo;
|
|
import com.izouma.nineth.repo.AuctionRecordRepo;
|
|
|
import com.izouma.nineth.repo.UserRepo;
|
|
import com.izouma.nineth.repo.UserRepo;
|
|
|
import com.izouma.nineth.utils.JpaUtils;
|
|
import com.izouma.nineth.utils.JpaUtils;
|
|
|
|
|
+import com.izouma.nineth.utils.SecurityUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -76,9 +77,13 @@ public class AuctionRecordService {
|
|
|
throw new BusinessException("出价低于当前竞拍价");
|
|
throw new BusinessException("出价低于当前竞拍价");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ if (SecurityUtils.getAuthenticatedUser().getId().equals(auction.getPurchaserId())) {
|
|
|
|
|
+ throw new BusinessException("请勿重复竞价");
|
|
|
|
|
+ }
|
|
|
AuctionRecord save = new AuctionRecord();
|
|
AuctionRecord save = new AuctionRecord();
|
|
|
BeanUtils.copyProperties(record, save);
|
|
BeanUtils.copyProperties(record, save);
|
|
|
save.setId(null);
|
|
save.setId(null);
|
|
|
|
|
+ save.setUser(SecurityUtils.getAuthenticatedUser().getNickname());
|
|
|
save.setBidderPrice(amount);
|
|
save.setBidderPrice(amount);
|
|
|
save.setType(AuctionRecordType.BIDDER);
|
|
save.setType(AuctionRecordType.BIDDER);
|
|
|
save = auctionRecordRepo.save(save);
|
|
save = auctionRecordRepo.save(save);
|
|
@@ -86,6 +91,8 @@ public class AuctionRecordService {
|
|
|
if (record.isPayDeposit()) {
|
|
if (record.isPayDeposit()) {
|
|
|
//保证金支付过,改成交价
|
|
//保证金支付过,改成交价
|
|
|
auction.setPurchasePrice(amount);
|
|
auction.setPurchasePrice(amount);
|
|
|
|
|
+ auction.setPurchaser(SecurityUtils.getAuthenticatedUser().getNickname());
|
|
|
|
|
+ auction.setPurchaserId(SecurityUtils.getAuthenticatedUser().getId());
|
|
|
auctionActivityRepo.save(auction);
|
|
auctionActivityRepo.save(auction);
|
|
|
}
|
|
}
|
|
|
return save;
|
|
return save;
|