From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:54 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java |  106 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
index 541715a..7efb838 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
@@ -1,7 +1,15 @@
 package com.ruoyi.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import model.Order;
+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.omg.CORBA.INTERNAL;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +20,99 @@
  * @since 2024-11-21
  */
 public interface OrderService extends IService<Order> {
-    boolean check(Integer orderId, Integer shopId);
+    List<OrderVO> selectOrderListByUserId(Integer status,Long userId);
+
+    OrderDetailVO getOrderDetail(Long orderId);
+
+    boolean check(Order order, Integer shopId, Long userId);
+
+    void writeOff(String id,Integer shopId);
+    
+    
+    /**
+     * 获取管理后台订单列表数据
+     * @param orderPageList
+     * @return
+     */
+    PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
+
+    /**
+     * 小程序取消订单
+     * @param orderId
+     * @return
+     */
+    R cancel(Long orderId);
+    
+    /**
+     * 确认发货操作
+     * @param orderId
+     * @param code
+     * @return
+     */
+    R confirmDelivery(Long orderId, String code);
+    
+    
+    /**
+     * 取消订单操作
+     * @param orderId
+     * @return
+     */
+    R cancelOrder(Long orderId);
+    
+    
+    /**
+     * 返回订单支付金额和回退积分和会员等级
+     * @param order
+     */
+    R refundPayMoney(Order order);
+
+    /**
+     * 取消订单后回调处理
+     * @return
+     */
+    R refundPayMoneyCallback(RefundCallbackResult refundCallbackResult);
+
+
+    /**
+     * 取消订单快递费回退
+     * @return
+     */
+    R refundExpressPayMoneyCallback(RefundCallbackResult refundCallbackResult);
+
+
+    /**
+     * 收货操作
+     * @param orderId
+     * @return
+     */
+    R receivingOperation(Long orderId);
+    
+    
+    /**
+     * 获取订单详情
+     * @param orderId
+     * @return
+     */
+    OrderInfoVo getOrderInfo(Long orderId);
+
+    /**
+     * 获取商品销售数量
+     * @param goodsId
+     * @return
+     */
+    Integer getGoodsSaleNum(Integer goodsId, Integer type);
+
+
+    /**
+     * 获取店铺订单数量
+     * @param shopId
+     * @param type
+     * @return
+     */
+    Integer getShopSaleNum(Integer shopId, Integer type);
+    
+    /**
+     * 定时查询快递信息
+     */
+    void taskExpress();
 }

--
Gitblit v1.7.1