From dde5ffcf56ba046b8f1870ad148341519f8d469a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 19:04:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java
index cc0485c..8dbd792 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java
@@ -1,16 +1,49 @@
 package cc.mrbird.febs.mall.service;
 
+import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
-import cc.mrbird.febs.mall.dto.MallOrderInfoDto;
+import cc.mrbird.febs.mall.dto.*;
 import cc.mrbird.febs.mall.entity.MallOrderInfo;
-import cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo;
-import cc.mrbird.febs.mall.vo.AdminMallOrderVo;
+import cc.mrbird.febs.mall.entity.MallOrderRefund;
+import cc.mrbird.febs.mall.vo.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
 
 public interface IAdminMallOrderService extends IService<MallOrderInfo> {
 
     IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request);
 
     AdminMallOrderVo getMallOrderInfoById(long id);
+
+    FebsResponse deliverGoods(DeliverGoodsDto deliverGoodsDto);
+
+    AdminOrderDetailVo getMallOrderDetailById(long id);
+
+    IPage<AdminMallOrderRefundVo> getRefundListInPage(MallOrderRefundDto mallOrderRefundDto, QueryRequest request);
+
+    IPage<AdminMallOrderRefundOperationVo> seeRefund(QueryRequest request, MallOrderRefund mallOrderRefund);
+
+    FebsResponse agreeRefund(Long id);
+
+    FebsResponse disagreeRefund(Long id);
+
+    FebsResponse refundConfirm(Long id);
+
+    IPage<AdminMallOrderRefundAddressVo> getMallOrderRefundAddressInPage(MallOrderRefundAddressDto mallOrderRefundAddressDto, QueryRequest request);
+
+    AdminMallOrderRefundAddressVo getMallOrderRefundAddressInfoById(long id);
+
+    FebsResponse addressUpdate(AddressUpdateDto addressUpdateDto);
+
+    FebsResponse deleteAddress(Long id);
+
+    FebsResponse addAddress(AddAddressDto addAddressDto);
+
+    List<AdminAddAddressTreeVo> getRefundAddress();
+
+    FebsResponse withAddressUpdate(WithAddressUpdateDto withAddressUpdateDto);
+
+    AdminMallOrderRefundVo getMallOrderRefundInfoById(long id);
 }

--
Gitblit v1.9.1