From c27c1f2beb4ca89a94eaa854fce6b4553db8f2f8 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 15 一月 2025 19:58:12 +0800 Subject: [PATCH] 修改 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 96 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 92 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 6250043..5777cc5 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 @@ -1,9 +1,13 @@ package com.ruoyi.order.service; 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.vo.OrderDetailVO; -import com.ruoyi.order.vo.OrderVO; +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; @@ -22,7 +26,91 @@ boolean check(Order order, Integer shopId, Long userId); - void writeOff(String code,Integer shopId); + void writeOff(String id,Integer shopId, String technicianId); + + + /** + * 获取管理后台订单列表数据 + * @param orderPageList + * @return + */ + PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList); - void commission(Long orderId); + /** + * 小程序取消订单 + * @param orderId + * @return + */ + R cancel(Long orderId); + + /** + * 确认发货操作 + * @return + */ + R confirmDelivery(ConfirmDelivery confirmDelivery); + + + /** + * 取消订单操作 + * @param orderId + * @return + */ + R cancelOrder(Long orderId); + + + /** + * 返回订单支付金额和回退积分和会员等级 + * @param order + */ + R refundPayMoney(Order order); + + /** + * 取消订单后回调处理 + * @return + */ + R refundPayMoneyCallback(RefundCallbackResult refundCallbackResult); + + + /** + * 取消订单快递费回退 + * @return + */ + R refundExpressPayMoneyCallback(RefundCallbackResult refundCallbackResult); + + + /** + * 收货操作 + * @param orderId + * @return + */ + R receivingOperation(Long orderId); + + + /** + * 获取订单详情 + * @param orderId + * @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(); } -- Gitblit v1.7.1