From 2951c68cea68f6c0eab405fa5fec7b1d18665ac9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 19:06:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java |   83 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index 3de0c88..3416ef8 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -2,9 +2,7 @@
 
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
-import cc.mrbird.febs.mall.dto.DeliverGoodsDto;
-import cc.mrbird.febs.mall.dto.MallOrderInfoDto;
-import cc.mrbird.febs.mall.dto.MallOrderRefundDto;
+import cc.mrbird.febs.mall.dto.*;
 import cc.mrbird.febs.mall.entity.*;
 import cc.mrbird.febs.mall.mapper.*;
 import cc.mrbird.febs.mall.service.IAdminMallOrderService;
@@ -36,6 +34,8 @@
     private final MallOrderRefundMapper mallOrderRefundMapper;
 
     private final MallOrderRefundOperationMapper mallOrderRefundOperationMapper;
+
+    private final MallOrderRefundAddressMapper mallOrderRefundAddressMapper;
 
     private final MallMoneyFlowMapper mallMoneyFlowMapper;
 
@@ -131,7 +131,7 @@
         MallOrderRefundOperation mallOrderRefundOperation = new MallOrderRefundOperation();
         mallOrderRefundOperation.setRefundId(mallOrderRefund.getId());
         mallOrderRefundOperation.setOrderId(mallOrderRefund.getOrderId());
-        mallOrderRefundOperation.setContent("已同意退款申请");
+        mallOrderRefundOperation.setContent("已同意退款不退货申请");
         mallOrderRefundOperationMapper.insert(mallOrderRefundOperation);
 
         return new FebsResponse().success();
@@ -191,5 +191,80 @@
         return new FebsResponse().success();
     }
 
+    @Override
+    public IPage<AdminMallOrderRefundAddressVo> getMallOrderRefundAddressInPage(MallOrderRefundAddressDto mallOrderRefundAddressDto, QueryRequest request) {
+        Page<AdminMallOrderRefundAddressVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<AdminMallOrderRefundAddressVo> adminMallOrderRefundAddressVos = mallOrderRefundAddressMapper.getMallOrderRefundAddressInPage(page, mallOrderRefundAddressDto);
+        return adminMallOrderRefundAddressVos;
+    }
+
+    @Override
+    public AdminMallOrderRefundAddressVo getMallOrderRefundAddressInfoById(long id) {
+        AdminMallOrderRefundAddressVo AdminMallOrderRefundAddressVo = mallOrderRefundAddressMapper.getMallOrderRefundAddressInfoById(id);
+        return AdminMallOrderRefundAddressVo;
+    }
+
+    @Override
+    public FebsResponse addressUpdate(AddressUpdateDto addressUpdateDto) {
+        Long id = addressUpdateDto.getId();
+        MallOrderRefundAddress mallOrderRefundAddress = mallOrderRefundAddressMapper.selectById(id);
+        mallOrderRefundAddress.setName(addressUpdateDto.getName());
+        mallOrderRefundAddress.setPhone(addressUpdateDto.getPhone());
+        mallOrderRefundAddress.setAddress(addressUpdateDto.getAddress());
+        mallOrderRefundAddressMapper.updateById(mallOrderRefundAddress);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse deleteAddress(Long id) {
+        mallOrderRefundAddressMapper.deleteById(id);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse addAddress(AddAddressDto addAddressDto) {
+        MallOrderRefundAddress mallOrderRefundAddress = new MallOrderRefundAddress();
+        mallOrderRefundAddress.setName(addAddressDto.getName());
+        mallOrderRefundAddress.setPhone(addAddressDto.getPhone());
+        mallOrderRefundAddress.setAddress(addAddressDto.getAddress());
+        mallOrderRefundAddressMapper.insert(mallOrderRefundAddress);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public List<AdminAddAddressTreeVo> getRefundAddress() {
+        List<AdminAddAddressTreeVo> list = mallOrderRefundAddressMapper.getRefundAddress();
+        return list;
+    }
+
+    @Override
+    public FebsResponse withAddressUpdate(WithAddressUpdateDto withAddressUpdateDto) {
+        Long addressId = withAddressUpdateDto.getAddressId();
+        MallOrderRefundAddress mallOrderRefundAddress = mallOrderRefundAddressMapper.selectById(addressId);
+
+        MallOrderRefund mallOrderRefund = mallOrderRefundMapper.selectById(withAddressUpdateDto.getId());
+        if(ObjectUtil.isEmpty(mallOrderRefund)){
+            return new FebsResponse().fail().message("系统繁忙，请刷新重试");
+        }
+        mallOrderRefund.setStatus(2);
+        mallOrderRefund.setName(mallOrderRefundAddress.getName());
+        mallOrderRefund.setPhone(mallOrderRefundAddress.getPhone());
+        mallOrderRefund.setAddress(mallOrderRefundAddress.getAddress());
+        mallOrderRefundMapper.updateById(mallOrderRefund);
+
+        MallOrderRefundOperation mallOrderRefundOperation = new MallOrderRefundOperation();
+        mallOrderRefundOperation.setRefundId(mallOrderRefund.getId());
+        mallOrderRefundOperation.setOrderId(mallOrderRefund.getOrderId());
+        mallOrderRefundOperation.setContent("已同意退款退货申请");
+        mallOrderRefundOperationMapper.insert(mallOrderRefundOperation);
+
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public AdminMallOrderRefundVo getMallOrderRefundInfoById(long id) {
+        return mallOrderRefundMapper.getMallOrderRefundInfoById(id);
+    }
+
 
 }

--
Gitblit v1.9.1