From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 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..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
@@ -6,9 +6,11 @@
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.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
+import java.util.Set;
/**
* <p>
@@ -25,7 +27,7 @@
boolean check(Order order, Integer shopId, Long userId);
- void writeOff(String code,Integer shopId);
+ void writeOff(String id,Integer shopId, String technicianId);
/**
@@ -34,15 +36,26 @@
* @return
*/
PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
-
+
+ /**
+ * 获取导出订单列表数据
+ */
+ List<OrderExport> getOrderExportList(OrderPageList orderPageList);
+
+
+
+ /**
+ * 小程序取消订单
+ * @param orderId
+ * @return
+ */
+ R cancel(Long orderId);
/**
* 确认发货操作
- * @param orderId
- * @param code
* @return
*/
- R confirmDelivery(Long orderId, String code);
+ R confirmDelivery(ConfirmDelivery confirmDelivery);
/**
@@ -87,4 +100,41 @@
* @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