From d33c34c76e74dbacf1bf7a57d7d3109e2bc54e68 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 30 八月 2024 11:49:23 +0800 Subject: [PATCH] 代码提交 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java index 70a4616..4615b05 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java @@ -4,6 +4,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.order.api.model.TShoppingOrder; +import com.ruoyi.order.api.query.ShoppingOrderQuery; import com.ruoyi.order.api.query.TActivityStatisticsQuery; import com.ruoyi.order.api.vo.TActivityStatisticslVO; import com.ruoyi.order.api.vo.TActivityVO; @@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; +import java.util.Map; /** * <p> @@ -34,7 +36,7 @@ * @param query * @return */ - List<MyShoppingOrderList> getMyShoppingOrderList(GetMyShoppingOrderList query); + Map<String, Object> getMyShoppingOrderList(GetMyShoppingOrderList query); /** @@ -54,6 +56,18 @@ /** + * 商城订单取消订单微信退款处理 + * @param out_refund_no 退款单号 + * @param refund_id 退款流水号 + * @param refund_status 退款状态 SUCCESS:退款成功 CLOSED:退款关闭 ABNORMAL:退款异常 + * @param success_time 退款成功时间 + * @return + */ + AjaxResult cancelShoppingOrderWxRefund(String out_refund_no, String refund_id, String refund_status, String success_time); + + + + /** * 获取未开票的订单列表 * @param query * @return @@ -61,4 +75,7 @@ List<MyShoppingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query); void callBack(String code,String outTradeNo); + + PageInfo<TShoppingOrder> pageList(ShoppingOrderQuery query); + } -- Gitblit v1.7.1