From 848e08c6cef8a6d62c9c9aa40b2f0b9363f3137f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Sep 2021 16:03:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java
index bfefbbc..3fb971d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java
@@ -7,6 +7,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IApiMallOrderInfoService extends IService<MallOrderInfo> {
 
@@ -14,7 +15,7 @@
 
     void cancelOrder(Long id);
 
-    String payOrder(PayOrderDto payOrderDto);
+    Map<String, Object> payOrder(PayOrderDto payOrderDto);
 
     List<OrderListVo> findOrderList(OrderListDto orderListDto);
 
@@ -27,4 +28,6 @@
     void applyRefund(AddRefundDto addRefundDto);
 
     void refundExpress(RefundExpressDto refundExpressDto);
+
+    void autoCancelOrder(Long id);
 }

--
Gitblit v1.9.1