我的保证金查询

bid/src/main/java/cn/hobbystocks/auc/task/BidTask.java

@@ -337,7 +337,7 @@ public class BidTask implements CacheMap {
         depositOrder.setStatus(1);
         List<DepositOrder> depositOrderList = depositOrderService.selectDepositOrder(depositOrder);
         for (DepositOrder order : depositOrderList) {
-            Long userId = order.getUserId();
+            Integer userId = order.getUserId();
             //判断拍卖会是否已结束
             Auction auction = auctionService.selectAuctionById(order.getAuctionId());
             if (!Constants.GROUP_STATUS_FINISH.equals(auction.getStatus())){

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

@@ -51,7 +51,7 @@ public class AddressController extends BaseController {
     public AjaxResult editUserAddr(@RequestBody ShippingAddressDto shippingAddressDto){
         LambdaUpdateWrapper<ShippingAddressDto> updateWrapper = new LambdaUpdateWrapper<>();
 
-        boolean update = addressService.update(shippingAddressDto, updateWrapper.eq(ShippingAddressDto::getUserId, shippingAddressDto.getUserId()));
+        boolean update = addressService.update(shippingAddressDto, updateWrapper.eq(ShippingAddressDto::getId, shippingAddressDto.getId()));
         if (!update)
             return AjaxResult.error();
         return AjaxResult.success();

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

@@ -3,18 +3,20 @@ package cn.hobbystocks.auc.web;
 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.DepositOrder;
 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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -33,19 +35,36 @@ public class DepositOrderController {
     //创建保证金订单接口
     @PostMapping("/deposit/create")
     @ApiOperation(value = "创建保证金订单接口",notes = "")
-    public AjaxResult createDepositOrder(DepositOrderDTO depositOrderDTO){
+    @ResponseBody
+    public AjaxResult createDepositOrder(@RequestBody DepositOrderDTO depositOrderDTO){
         UserInfo simpleUserInfo = UserUtils.getSimpleUserInfo();
         if (Objects.isNull(simpleUserInfo))
             return AjaxResult.error("请先登录");
         //todo 判断是否已经缴纳保证金，需要查询订单记录，
-        depositOrderDTO.setUserId(Long.valueOf(simpleUserInfo.getId()));
-        OrderVO depositOrder = orderService.createDepositOrder(depositOrderDTO);
+        depositOrderDTO.setUserId(simpleUserInfo.getId());
+        orderService.createDepositOrder(depositOrderDTO);
         return AjaxResult.success();
     }
 
     //我的保证金订单
-    public AjaxResult depositOrderList(){
+    @PostMapping("/deposit/list")
+    @ResponseBody
+    @ApiOperation(value = "保证金订单查询",notes = "根据保证金订单状态分页查询保证金信息;")
+    public AjaxResult depositOrderList(@RequestBody DepositOrderDTO depositOrderDTO){
 
-        return AjaxResult.success();
+        UserInfo simpleUserInfo = UserUtils.getSimpleUserInfo();
+        if (simpleUserInfo==null)
+            return AjaxResult.error("请先登录");
+        Integer userId = simpleUserInfo.getId();
+        //根据userId 查询保证金信息
+        LambdaQueryWrapper<DepositOrder> depositOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        depositOrderLambdaQueryWrapper.eq(DepositOrder::getUserId,userId);
+        Integer status = depositOrderDTO.getStatus();
+        if (status!=null){
+            depositOrderLambdaQueryWrapper.eq(DepositOrder::getStatus,status);
+        }
+        PageUtils.startPage(depositOrderDTO);
+        List<DepositOrder> list = orderService.list(depositOrderLambdaQueryWrapper);
+        return AjaxResult.success(list);
     }
 }

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

@@ -65,7 +65,7 @@ public class LocalController {
     @ApiImplicitParams({
         @ApiImplicitParam(name = "orderNo",value = "订单号"),@ApiImplicitParam(name = "status" ,value = "订单状态")
     })
-    public AjaxResult callback(@PathVariable("orderNo") String orderNo,@PathVariable("status") Long status){
+    public AjaxResult callback(@PathVariable("orderNo") String orderNo,@PathVariable("status") Integer status){
         //根据orderId更新order状态
         Order order = Order.builder().orderNo(orderNo).status(status).build();
         int num = orderService.modifyOrder(order);

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

@@ -1,16 +1,18 @@
 package cn.hobbystocks.auc.domain;
 
+import cn.hobbystocks.auc.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @TableName("deposit_order_record")
 @Data
-public class DepositOrder {
-    @TableId
+public class DepositOrder extends BaseEntity {
+    @TableId(type = IdType.AUTO)
     private Long id;
 
-    private Long userId;
+    private Integer userId;
     private Long lotId;
     private Long auctionId;
     private String name;

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

@@ -26,7 +26,7 @@ public class Order {
     private Long skuId;
     private String orderNo;
     //支付状态：
-    private Long status;
+    private Integer status;
     private Date expireTime;
     private Integer flag;
 }

lot/src/main/java/cn/hobbystocks/auc/dto/DepositOrderDTO.java

@@ -1,24 +1,38 @@
 package cn.hobbystocks.auc.dto;
 
+import cn.hobbystocks.auc.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 保证金订单
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class DepositOrderDTO {
+@ApiModel("保证金订单")
+public class DepositOrderDTO extends BaseEntity {
     //用户id
-    private Long userId;
+    @ApiModelProperty("用户id")
+    private Integer userId;
     //拍卖会id
+    @ApiModelProperty("拍卖会id")
     private Long auctionId;
     //保证金名称
+    @ApiModelProperty("保证金名称")
     private String name;
     //保证金类型
+    @ApiModelProperty("保证金类型")
     private String depositType;
-
+    @ApiModelProperty("拍品id")
     private Long lotId;
     //保证金金额
+    @ApiModelProperty("保证金金额")
     private Long amount;
     //商家id
+    @ApiModelProperty("商家id")
     private Long merchantId;
+    @ApiModelProperty("保证金订单状态：0、待支付，1、已支付待退款，2、已退款，3、已扣款")
+    private Integer status;
 }

lot/src/main/java/cn/hobbystocks/auc/mapper/OrderMapper.java

@@ -19,5 +19,5 @@ public interface OrderMapper extends BaseMapper<Order> {
     List<Order> selectOrderInfoList(Order order);
 
     //查询用户在指定拍卖会下的未设置单独保证金的未支付拍品订单
-    List<Order> selectOrderByAuctionId(@Param("auctionId")Long auctionId,@Param("userId")Long userId);
+    List<Order> selectOrderByAuctionId(@Param("auctionId")Long auctionId,@Param("userId")Integer userId);
 }

lot/src/main/java/cn/hobbystocks/auc/service/DepositOrderService.java

@@ -12,7 +12,7 @@ import java.util.List;
  */
 public interface DepositOrderService extends IService<DepositOrder> {
 
-    OrderVO createDepositOrder(DepositOrderDTO depositOrderDTO);
+    int createDepositOrder(DepositOrderDTO depositOrderDTO);
 
     /**
      * 保证金订单退款

lot/src/main/java/cn/hobbystocks/auc/service/IOrderService.java

@@ -20,7 +20,7 @@ public interface IOrderService extends IService<Order> {
      * @param userId
      * @return
      */
-    List<Order> getOrderListByUserAndAuction(Long auctionId,Long userId);
+    List<Order> getOrderListByUserAndAuction(Long auctionId,Integer userId);
 
 
 

lot/src/main/java/cn/hobbystocks/auc/service/impl/DepositOrderServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -31,7 +32,7 @@ public class DepositOrderServiceImpl extends ServiceImpl<DepositOrderMapper, Dep
 
     @Override
     @Transactional
-    public OrderVO createDepositOrder(DepositOrderDTO depositOrderDTO) {
+    public int createDepositOrder(DepositOrderDTO depositOrderDTO) {
 
         //查询拍品保证金配置
         Long lotId = depositOrderDTO.getLotId();
@@ -53,13 +54,13 @@ public class DepositOrderServiceImpl extends ServiceImpl<DepositOrderMapper, Dep
         depositOrderDTO.setLotId(lotId);
         depositOrderDTO.setMerchantId(lot.getMerchantId());
         //todo 调用创建保证金订单接口
-        OrderVO orderVO = orderApi.createDepositOrder(depositOrderDTO);
+//        OrderVO orderVO = orderApi.createDepositOrder(depositOrderDTO);
         //保存保证金订单记录
         DepositOrder depositOrder=new DepositOrder();
         BeanUtils.copyProperties(depositOrderDTO,depositOrder);
         depositOrder.setStatus(0);
-        getBaseMapper().insert(depositOrder);
-        return orderVO;
+        depositOrder.setCreateTime(new Date());
+        return baseMapper.insert(depositOrder);
     }
     @Override
     public OrderVO refundDepositOrder(String orderNo) {

lot/src/main/java/cn/hobbystocks/auc/service/impl/OrderServiceImpl.java

@@ -81,7 +81,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper,Order> implements
     }
 
     @Override
-    public List<Order> getOrderListByUserAndAuction(Long auctionId, Long userId) {
+    public List<Order> getOrderListByUserAndAuction(Long auctionId, Integer userId) {
         return getBaseMapper().selectOrderByAuctionId(auctionId,userId);
     }
 

lot/src/main/java/cn/hobbystocks/auc/vo/OrderVO.java

@@ -19,6 +19,6 @@ public class OrderVO {
     @ApiModelProperty("订单过期时间")
     private Date expireTime;
     @ApiModelProperty("订单状态")
-    private Long status;
+    private Integer status;
 
 }