From 3de79cb08809a47a91d354331ab166ab7cc87dc6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 11:02:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 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 4ee3d67..b13d923 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
@@ -2,8 +2,11 @@
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.vo.*;
+import org.omg.CORBA.INTERNAL;
import org.springframework.web.bind.annotation.PathVariable;
import java.util.List;
@@ -23,7 +26,7 @@
boolean check(Order order, Integer shopId, Long userId);
- void writeOff(String code,Integer shopId);
+ void writeOff(String id,Integer shopId);
/**
@@ -31,8 +34,14 @@
* @param orderPageList
* @return
*/
- List<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
-
+ PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
+
+ /**
+ * 小程序取消订单
+ * @param orderId
+ * @return
+ */
+ R cancel(Long orderId);
/**
* 确认发货操作
@@ -40,7 +49,7 @@
* @param code
* @return
*/
- R confirmDelivery(String orderId, String code);
+ R confirmDelivery(Long orderId, String code);
/**
@@ -51,6 +60,26 @@
R cancelOrder(Long orderId);
+ /**
+ * 返回订单支付金额和回退积分和会员等级
+ * @param order
+ */
+ R refundPayMoney(Order order);
+
+ /**
+ * 取消订单后回调处理
+ * @return
+ */
+ R refundPayMoneyCallback(RefundCallbackResult refundCallbackResult);
+
+
+ /**
+ * 取消订单快递费回退
+ * @return
+ */
+ R refundExpressPayMoneyCallback(RefundCallbackResult refundCallbackResult);
+
+
/**
* 收货操作
* @param orderId
@@ -65,4 +94,20 @@
* @return
*/
OrderInfoVo getOrderInfo(Long orderId);
+
+ /**
+ * 获取商品销售数量
+ * @param goodsId
+ * @return
+ */
+ Integer getGoodsSaleNum(Integer goodsId, Integer type);
+
+
+ /**
+ * 获取店铺订单数量
+ * @param shopId
+ * @param type
+ * @return
+ */
+ Integer getShopSaleNum(Integer shopId, Integer type);
}
--
Gitblit v1.7.1