From c99b2aad164da7ce15536b716854da9ae46780ae Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 10:51:32 +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 |   66 ++++++++++++++++++++++++++++++++
 1 files changed, 65 insertions(+), 1 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 9a9e5d8..7919c46 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
@@ -41,6 +41,8 @@
 
     private final IApiMallMemberWalletService iApiMallMemberWalletService;
 
+    private final MallMemberPaymentMapper mallMemberPaymentMapper;
+
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
 
     @Override
@@ -127,8 +129,28 @@
         if(ObjectUtil.isEmpty(mallOrderRefund)){
             return new FebsResponse().fail().message("系统繁忙，请刷新重试");
         }
-        mallOrderRefund.setStatus(2);
+        Integer status = mallOrderRefund.getStatus();
+        if(status != 1){
+            return new FebsResponse().fail().message("申请记录不是已申请状态，请刷新页面");
+        }
+        mallOrderRefund.setStatus(5);
         mallOrderRefundMapper.updateById(mallOrderRefund);
+
+        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(mallOrderRefund.getOrderId());
+        mallOrderInfo.setStatus(6);
+        mallOrderInfoMapper.updateById(mallOrderInfo);
+
+        if(!"微信支付".equals(mallOrderInfo.getPayMethod()) && !"支付宝支付".equals(mallOrderInfo.getPayMethod())){
+            //用户钱包增加对应的余额
+            iApiMallMemberWalletService.addBalance(mallOrderInfo.getAmount(),mallOrderInfo.getMemberId());
+            //新增一条资金流水
+            MallMoneyFlow mallMoneyFlow = new MallMoneyFlow();
+            mallMoneyFlow.setMemberId(mallOrderRefund.getMemberId());
+            mallMoneyFlow.setOrderNo(mallOrderInfo.getOrderNo());
+            mallMoneyFlow.setType(4);
+            mallMoneyFlow.setAmount(mallOrderInfo.getAmount());
+            mallMoneyFlowMapper.insert(mallMoneyFlow);
+        }
 
         MallOrderRefundOperation mallOrderRefundOperation = new MallOrderRefundOperation();
         mallOrderRefundOperation.setRefundId(mallOrderRefund.getId());
@@ -145,6 +167,10 @@
         if(ObjectUtil.isEmpty(mallOrderRefund)){
             return new FebsResponse().fail().message("系统繁忙，请刷新重试");
         }
+        Integer status = mallOrderRefund.getStatus();
+        if(status != 1){
+            return new FebsResponse().fail().message("申请记录不是已申请状态，请刷新页面");
+        }
         mallOrderRefund.setStatus(3);
         mallOrderRefundMapper.updateById(mallOrderRefund);
 
@@ -153,6 +179,10 @@
         mallOrderRefundOperation.setOrderId(mallOrderRefund.getOrderId());
         mallOrderRefundOperation.setContent("不同意退款申请");
         mallOrderRefundOperationMapper.insert(mallOrderRefundOperation);
+        //恢复订单状态
+        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(mallOrderRefund.getOrderId());
+        mallOrderInfo.setStatus(mallOrderRefund.getBeforeStatus());
+        mallOrderInfoMapper.updateById(mallOrderInfo);
 
         return new FebsResponse().success();
     }
@@ -162,6 +192,10 @@
         MallOrderRefund mallOrderRefund = mallOrderRefundMapper.selectById(id);
         if(ObjectUtil.isEmpty(mallOrderRefund)){
             return new FebsResponse().fail().message("系统繁忙，请刷新重试");
+        }
+        Integer status = mallOrderRefund.getStatus();
+        if(status != 4){
+            return new FebsResponse().fail().message("申请记录不是已提交物流信息状态，请刷新页面");
         }
         mallOrderRefund.setStatus(5);
         mallOrderRefundMapper.updateById(mallOrderRefund);
@@ -248,6 +282,10 @@
         if(ObjectUtil.isEmpty(mallOrderRefund)){
             return new FebsResponse().fail().message("系统繁忙，请刷新重试");
         }
+        Integer status = mallOrderRefund.getStatus();
+        if(status != 1){
+            return new FebsResponse().fail().message("申请记录不是已申请状态，请刷新页面");
+        }
         mallOrderRefund.setStatus(2);
         mallOrderRefund.setName(mallOrderRefundAddress.getName());
         mallOrderRefund.setPhone(mallOrderRefundAddress.getPhone());
@@ -293,5 +331,31 @@
         return new FebsResponse().success();
     }
 
+    @Override
+    public FebsResponse cancelOrder(Long id) {
+        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(id);
+        if(ObjectUtil.isEmpty(mallOrderInfo)){
+            return new FebsResponse().fail().message("系统繁忙，请刷新重试");
+        }
+        Integer status = mallOrderInfo.getStatus();
+        if(status != 2){
+            return new FebsResponse().fail().message("订单不是代发货状态");
+        }
+        mallOrderInfo.setStatus(7);
+        mallOrderInfoMapper.updateById(mallOrderInfo);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public AdminMallMemberPaymentVo getMallMemberRefundPayInfoByFlowId(long id) {
+        AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
+        MallOrderRefund mallOrderRefund = mallOrderRefundMapper.selectById(id);
+        AdminMallMemberPaymentVo adminMallMemberPaymentVoa = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallOrderRefund.getMemberId());
+        if(ObjectUtil.isNotEmpty(adminMallMemberPaymentVoa)){
+            adminMallMemberPaymentVo = adminMallMemberPaymentVoa;
+        }
+        return adminMallMemberPaymentVo;
+    }
+
 
 }

--
Gitblit v1.9.1