保证金订单列表新增排序 新增图片字段

新增修改保证金状态接口

bid/src/main/java/cn/hobbystocks/auc/web/DepositOrderController.java

@@ -4,14 +4,17 @@ import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.common.user.UserInfo;
 import cn.hobbystocks.auc.common.user.UserUtils;
 import cn.hobbystocks.auc.common.utils.PageUtils;
+import cn.hobbystocks.auc.domain.Auction;
 import cn.hobbystocks.auc.domain.DepositOrder;
+import cn.hobbystocks.auc.domain.Lot;
 import cn.hobbystocks.auc.dto.DepositOrderDTO;
 import cn.hobbystocks.auc.service.DepositOrderService;
-import cn.hobbystocks.auc.service.IOrderService;
-import cn.hobbystocks.auc.vo.OrderVO;
+import cn.hobbystocks.auc.service.IAuctionService;
+import cn.hobbystocks.auc.service.ILotService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -30,6 +33,10 @@ public class DepositOrderController {
 
     @Autowired
     DepositOrderService orderService;
+    @Autowired
+    ILotService lotService;
+    @Autowired
+    IAuctionService auctionService;
 
 
     //创建保证金订单接口
@@ -63,11 +70,27 @@ public class DepositOrderController {
         if (status != null) {
             depositOrderLambdaQueryWrapper.eq(DepositOrder::getStatus, status);
         }
+        depositOrderLambdaQueryWrapper.orderByDesc(DepositOrder::getCreateTime);
         PageUtils.startPage(depositOrderDTO);
         List<DepositOrder> list = orderService.list(depositOrderLambdaQueryWrapper);
+        list.forEach(this::fillDepositOrderImg);
         return AjaxResult.success(list);
     }
 
+    private void fillDepositOrderImg(DepositOrder depositOrder) {
+        if (Objects.equals("拍卖会", depositOrder.getDepositType())) {
+            Auction auction = auctionService.selectAuctionById(depositOrder.getAuctionId());
+            if (Objects.nonNull(auction)) {
+                depositOrder.setImg(auction.getImgs());
+            }
+            return;
+        }
+        Lot lot = lotService.selectLotById(depositOrder.getLotId());
+        if (Objects.nonNull(lot)) {
+            depositOrder.setImg(lot.getImgs());
+        }
+    }
+
     @GetMapping("deposit/detail/{depositOrderNo}")
     public AjaxResult depositOrderDetail(@PathVariable String depositOrderNo) {
         UserInfo simpleUserInfo = UserUtils.getSimpleUserInfo();
@@ -80,4 +103,12 @@ public class DepositOrderController {
         DepositOrder depositOrder = orderService.getOne(depositOrderLambdaQueryWrapper);
         return AjaxResult.success(depositOrder);
     }
+
+    @GetMapping("/deposit/update/{depositOrderNo}")
+    @ApiOperation("修改保证金状态")
+    public AjaxResult updateStatue(@ApiParam("保证金单号") @PathVariable String depositOrderNo) {
+        orderService.lambdaUpdate().eq(DepositOrder::getOrderNo, depositOrderNo)
+            .set(DepositOrder::getStatus, 1).update();
+        return AjaxResult.success();
+    }
 }

lot/src/main/java/cn/hobbystocks/auc/domain/DepositOrder.java

@@ -2,6 +2,7 @@ package cn.hobbystocks.auc.domain;
 
 import cn.hobbystocks.auc.common.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -28,4 +29,7 @@ public class DepositOrder extends BaseEntity {
     private Date payTime;
 
     private Integer payType;
+
+    @TableField(exist = false)
+    private String img;
 }