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 | 27 +++++++++++++++++++++++++--
1 files changed, 25 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 7b32545..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
@@ -6,6 +6,7 @@
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;
@@ -25,7 +26,7 @@
boolean check(Order order, Integer shopId, Long userId);
- void writeOff(String code,Integer shopId);
+ void writeOff(String id,Integer shopId);
/**
@@ -34,7 +35,13 @@
* @return
*/
PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
-
+
+ /**
+ * 小程序取消订单
+ * @param orderId
+ * @return
+ */
+ R cancel(Long orderId);
/**
* 确认发货操作
@@ -87,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