修改bug

puzhibing

2025-01-07 eb5d7885fa9e4bd20c0827eec9b4cdd48c47b509

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java

@@ -2,7 +2,9 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.model.Order;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.vo.*;
import org.springframework.web.bind.annotation.PathVariable;

@@ -31,7 +33,7 @@
     * @param orderPageList
     * @return
     */
    List<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
    PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
    
    
    /**
@@ -40,7 +42,7 @@
     * @param code
     * @return
     */
    R confirmDelivery(String orderId, String code);
    R confirmDelivery(Long orderId, String code);
    
    
    /**
@@ -55,9 +57,22 @@
     * 返回订单支付金额和回退积分和会员等级
     * @param order
     */
    void refundPayMoney(Order order);
    
    
    R refundPayMoney(Order order);

    /**
     * 取消订单后回调处理
     * @return
     */
    R refundPayMoneyCallback(RefundCallbackResult refundCallbackResult);


    /**
     * 取消订单快递费回退
     * @return
     */
    R refundExpressPayMoneyCallback(RefundCallbackResult refundCallbackResult);


    /**
     * 收货操作
     * @param orderId