From 683592139be3975b93234dcaf71e29c8aee40352 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 20:25:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 95 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 6161981..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
@@ -1,9 +1,13 @@
package com.ruoyi.order.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.order.vo.OrderDetailVO;
-import com.ruoyi.order.vo.OrderVO;
-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;
@@ -20,7 +24,93 @@
OrderDetailVO getOrderDetail(Long orderId);
- boolean check(String orderNumber, Long shopId);
+ boolean check(Order order, Integer shopId, Long userId);
- void writeOff(String code);
+ void writeOff(String id,Integer shopId, String technicianId);
+
+
+ /**
+ * 获取管理后台订单列表数据
+ * @param orderPageList
+ * @return
+ */
+ PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
+
+ /**
+ * 小程序取消订单
+ * @param orderId
+ * @return
+ */
+ R cancel(Long orderId);
+
+ /**
+ * 确认发货操作
+ * @return
+ */
+ R confirmDelivery(ConfirmDelivery confirmDelivery);
+
+
+ /**
+ * 取消订单操作
+ * @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, Long userId);
+
+
+ /**
+ * 获取店铺订单数量
+ * @param shopId
+ * @param type
+ * @return
+ */
+ Integer getShopSaleNum(Integer shopId, Integer type);
+
+ /**
+ * 定时查询快递信息
+ */
+ void taskExpress();
}
--
Gitblit v1.7.1