Merge remote-tracking branch 'origin/master'

mitao

2024-05-29 b19813f4f558c350b2c6e8fcb821080b0c10b257

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java

@@ -2,8 +2,12 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
@@ -14,18 +18,17 @@
import com.ruoyi.order.domain.pojo.Paylog;
import com.ruoyi.order.mapper.OrderAuctionBondMapper;
import com.ruoyi.order.service.IOrderAuctionBondService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.service.IPaylogService;
import com.ruoyi.order.util.SinataUtil;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
import java.util.List;
import javax.annotation.Resource;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.feignClient.AuctionClient;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -85,6 +88,35 @@
        return R.ok();
    }

    /**
     * 查询保证金订单列表
     *
     * @param id                   拍卖商品id
     * @param auctionOrderTypeEnum 拍卖类型： 普通拍品 拍卖会拍品
     * @param bondStatusEnum       保证金状态 待支付 已支付 已退款 为null则查询所有
     * @return List<OrderAuctionBond>
     */
    @Override
    public List<OrderAuctionBond> getOrderAuctionBondList(Long id,
            AuctionOrderTypeEnum auctionOrderTypeEnum, BondStatusEnum bondStatusEnum) {
        return this.lambdaQuery().eq(OrderAuctionBond::getAuctionGoodsId, id)
                .eq(OrderAuctionBond::getBondType, auctionOrderTypeEnum).eq(
                        StringUtils.isNotNull(bondStatusEnum), OrderAuctionBond::getBoundStatus,
                        bondStatusEnum).list();
    }

    /**
     * 批量更新保证金订单状态
     *
     * @param ids            保证金订单id列表
     * @param bondStatusEnum 保证金状态
     */
    @Override
    public void updateOrderAuctionBondStatus(List<Long> ids, BondStatusEnum bondStatusEnum) {
        this.lambdaUpdate().set(OrderAuctionBond::getBoundStatus, bondStatusEnum)
                .in(OrderAuctionBond::getId, ids).update();
    }

    @Override
    public PayInfoVO SaveOrderAuctionBond(MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
        PayInfoVO payInfoVO = new PayInfoVO();