修改bug

无关风月

2025-01-14 66abc3ce8009e42790c073d752a9a36e022ed668

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java

@@ -14,8 +14,10 @@
import com.ruoyi.order.enums.OrderStatus;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.model.Order;
import com.ruoyi.order.model.RefundPass;
import com.ruoyi.order.service.CommissionService;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.service.RefundPassService;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.BaseSetting;
@@ -66,6 +68,8 @@
    private OrderMapper orderMapper;
    @Resource
    private SysUserClient sysUserClient;
    @Resource
    private RefundPassService refundPassService;


    /**
@@ -263,6 +267,10 @@
    @ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
    public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId){
        OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
        RefundPass refundPass = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderId).one();
        if (refundPass!=null){
            orderInfo.setRefundPassId(refundPass.getId().toString());
        }
        return R.ok(orderInfo);
    }