From c27c1f2beb4ca89a94eaa854fce6b4553db8f2f8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 19:58:12 +0800
Subject: [PATCH] 修改

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 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 7b32545..5777cc5 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
@@ -6,6 +6,7 @@
 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;
@@ -25,7 +26,7 @@
 
     boolean check(Order order, Integer shopId, Long userId);
 
-    void writeOff(String code,Integer shopId);
+    void writeOff(String id,Integer shopId, String technicianId);
     
     
     /**
@@ -34,15 +35,19 @@
      * @return
      */
     PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
-    
+
+    /**
+     * 小程序取消订单
+     * @param orderId
+     * @return
+     */
+    R cancel(Long orderId);
     
     /**
      * 确认发货操作
-     * @param orderId
-     * @param code
      * @return
      */
-    R confirmDelivery(Long orderId, String code);
+    R confirmDelivery(ConfirmDelivery confirmDelivery);
     
     
     /**
@@ -87,4 +92,25 @@
      * @return
      */
     OrderInfoVo getOrderInfo(Long orderId);
+
+    /**
+     * 获取商品销售数量
+     * @param goodsId
+     * @return
+     */
+    Integer getGoodsSaleNum(Integer goodsId, Integer type, Long userId);
+
+
+    /**
+     * 获取店铺订单数量
+     * @param shopId
+     * @param type
+     * @return
+     */
+    Integer getShopSaleNum(Integer shopId, Integer type);
+    
+    /**
+     * 定时查询快递信息
+     */
+    void taskExpress();
 }

--
Gitblit v1.7.1