From be2e00346362a9a3ff4f1a46de134639c73953ed Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 15 七月 2025 14:11:55 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
index dac1e6e..b5971b3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
@@ -7,6 +7,7 @@
import com.github.binarywang.wxpay.bean.ecommerce.RefundNotifyResult;
import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingNotifyResult;
import com.github.binarywang.wxpay.exception.WxPayException;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.vo.*;
@@ -442,7 +443,7 @@
* @param orderId
* @return void
*/
- void autoCancelOrder(String orderId);
+ void autoCancelOrder(String orderId, Integer cancelType);
/**
* @description 订单支付回调
@@ -457,7 +458,7 @@
* 取消订单
* @param orderId
*/
- void refundOrder(String orderId);
+ void refundOrder(String orderId, Integer cancelType);
/**
* @description 员工端活动订单统计
@@ -615,4 +616,40 @@
* @return
*/
List<String> getActivityOrderGoods(String activityId);
+
+ /**
+ * 后台取消订单
+ * 订单状态变为已取消 不退款
+ * @param dto
+ */
+ R cancelOrderBySys(CancelOrderDTO dto);
+
+ /**
+ * 后台退款订单
+ * @param dto
+ * @return
+ */
+ R refundOrderBySys(CancelOrderDTO dto);
+
+ /**
+ * 三方订单
+ * @param page
+ * @param dto
+ * @return
+ */
+ List<MgtThirdOrderPageVo> pageMgtThirdOrder(Page<MgtThirdOrderPageVo> page, MgtThirdOrderPageDto dto);
+
+ /**
+ * 三方订单统计
+ * @param mgtBasePlatformDto
+ * @return
+ */
+ MgtPlTotalThirdOrderStaticsVO getPlTotalThirdOrderStatics(MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * 获取商品售卖统计
+ * @param goodsIdList
+ * @return
+ */
+ StaticsShopMgtGoodsVO getGoodsSellStatic(List<String> goodsIdList);
}
--
Gitblit v1.7.1