From cbf2486983b77a27af9968bbb362cb8d43789115 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 26 三月 2025 15:30:53 +0800
Subject: [PATCH] 修改统计bug和部分功能修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 128 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 126 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..5d4d8a8 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,16 @@
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.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Set;
/**
* <p>
@@ -12,5 +21,120 @@
* @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, String technicianId);
+
+
+ /**
+ * 获取管理后台订单列表数据
+ * @param orderPageList
+ * @return
+ */
+ PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
+
+ /**
+ * 获取导出订单列表数据
+ */
+ List<OrderExport> getOrderExportList(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();
+
+ /**
+ * 导入物流信息
+ */
+ void importExpress(String url);
+
+ Integer getShopSaleNumByShopIds(List<Integer> shopIds, Integer type);
+
+
+ /**
+ * 查询给定用户在给定门店核销的订单
+ * @param shopId
+ * @param appUserId
+ * @return
+ */
+ List<Order> getOrderByAppUserIdsAndWriteOffShop(@RequestParam("shopId") Integer shopId, @RequestParam("appUserId") Set<Long> appUserId);
}
--
Gitblit v1.7.1