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 | 41 ++++++++++++++++++++++++++++++++++------- 1 files changed, 34 insertions(+), 7 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 9233416..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,10 +6,11 @@ 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 org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.multipart.MultipartFile; import java.util.List; +import java.util.Set; /** * <p> @@ -26,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); /** @@ -37,6 +38,13 @@ PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList); /** + * 获取导出订单列表数据 + */ + List<OrderExport> getOrderExportList(OrderPageList orderPageList); + + + + /** * 小程序取消订单 * @param orderId * @return @@ -45,11 +53,9 @@ /** * 确认发货操作 - * @param orderId - * @param code * @return */ - R confirmDelivery(Long orderId, String code); + R confirmDelivery(ConfirmDelivery confirmDelivery); /** @@ -100,7 +106,7 @@ * @param goodsId * @return */ - Integer getGoodsSaleNum(Integer goodsId, Integer type); + Integer getGoodsSaleNum(Integer goodsId, Integer type, Long userId); /** @@ -110,4 +116,25 @@ * @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