From 6acf6357094588946b5528f1ef1ed84a0f1037fd Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 13 六月 2025 19:45:27 +0800
Subject: [PATCH] 小程序收付款
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 07f1b45..65464b7 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,15 +1,22 @@
package com.ruoyi.order.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
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.util.payment.model.UniPayCallbackResult;
+import com.ruoyi.order.util.payment.wx.vo.PayResult;
import com.ruoyi.order.vo.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -26,7 +33,7 @@
boolean check(Order order, Integer shopId, Long userId);
- void writeOff(String id,Integer shopId, String technicianId);
+ void writeOff(String id,Integer shopId);
/**
@@ -34,7 +41,7 @@
* @param orderPageList
* @return
*/
- PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
+ PageInfo<OrderManagePageListVO> getOrderPageList(OrderPageList orderPageList);
/**
* 获取导出订单列表数据
@@ -69,7 +76,7 @@
* 取消订单后回调处理
* @return
*/
- R refundPayMoneyCallback(RefundCallbackResult refundCallbackResult);
+ R refundPayMoneyCallback(String xmlData);
/**
@@ -118,9 +125,18 @@
/**
* 订单支付回调通知
*/
- R orderPaymentCallback(UniPayCallbackResult uniPayCallbackResult);
+ R orderPaymentCallback(PayResult payResult);
/**
* 定时任务关闭订单
*/
void closeOrder();
+
+ IPage<OrderPageListVo> getShopOrderList(String content, Integer status, Integer shopId, Integer pageNum, Integer pageSize);
+
+ R shopCancelOrder(Long orderId);
+
+ /**
+ * 后台-工作台，订单折线图
+ */
+ List<OrderStatisticsDetail> getOrderListGroupByDate(LocalDate startTime, LocalDate endTime,Integer shopId);
}
--
Gitblit v1.7.1