保证金接口

src/main/java/com/izouma/nineth/domain/AuctionRecord.java

@@ -27,7 +27,7 @@ public class AuctionRecord extends BaseEntity {
     @ApiModelProperty("拍卖活动ID")
     private Long              auctionId;
     @ApiModelProperty("拍卖活动")
-    private Long              name;
+    private String            name;
     @ApiModelProperty("拍卖活动图片")
     private String            auctionPic;
     @Enumerated(EnumType.STRING)

src/main/java/com/izouma/nineth/web/AuctionOrderController.java

@@ -2,9 +2,12 @@ package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.AuctionActivity;
 import com.izouma.nineth.domain.AuctionOrder;
+import com.izouma.nineth.domain.AuctionRecord;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.enums.AuctionPaymentType;
+import com.izouma.nineth.enums.AuctionRecordType;
 import com.izouma.nineth.repo.AuctionActivityRepo;
+import com.izouma.nineth.repo.AuctionRecordRepo;
 import com.izouma.nineth.service.AuctionOrderService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
@@ -29,6 +32,7 @@ public class AuctionOrderController extends BaseController {
     private AuctionOrderService auctionOrderService;
     private AuctionOrderRepo    auctionOrderRepo;
     private AuctionActivityRepo auctionActivityRepo;
+    private AuctionRecordRepo   auctionRecordRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -44,12 +48,32 @@ public class AuctionOrderController extends BaseController {
     }
 
     @PostMapping("/create")
-    @ApiModelProperty(value = "创建拍卖订单（支付，一口价，保证金）")
+    @ApiModelProperty(value = "创建拍卖订单（支付，一口价）")
     public AuctionOrder create(Long userId, @RequestParam(required = false) Long auctionId,
                                Long addressId, Long auctionRecordId, AuctionPaymentType type) {
         return auctionOrderService.create(userId, auctionId, addressId, auctionRecordId, type);
     }
 
+    @PostMapping("/createDeposit")
+    @ApiModelProperty(value = "创建拍卖订单（保证金）")
+    public AuctionOrder createDeposit(Long userId, @RequestParam(required = false) Long auctionId,
+                                      Long addressId, AuctionPaymentType type) {
+        AuctionActivity auctionActivity = auctionActivityRepo.findById(auctionId)
+                .orElseThrow(new BusinessException("暂无"));
+        AuctionRecord auctionRecord = AuctionRecord.builder()
+                .auctionId(auctionId)
+                .type(AuctionRecordType.DEPOSIT)
+                .bidderPrice(auctionActivity.getDeposit())
+                .auctionPic(auctionActivity.getPic().get(0).toString())
+                .userId(SecurityUtils.getAuthenticatedUser().getId())
+                .avatar(SecurityUtils.getAuthenticatedUser().getAvatar())
+                .name(auctionActivity.getName())
+                .purchased(false)
+                .build();
+        AuctionRecord record = auctionRecordRepo.save(auctionRecord);
+        return auctionOrderService.create(userId, auctionId, addressId, record.getId(), type);
+    }
+
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
     public Page<AuctionOrder> all(@RequestBody PageQuery pageQuery) {