From 33af5e87c8cfabf8e3dfdca5318a70b5c0d97570 Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Thu, 19 May 2022 21:25:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8Ebug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StoreAfterSalesServiceImpl.java     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java
index 89549a68..3f6ababa 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java
@@ -28,6 +28,7 @@ import co.yixiang.modules.sales.service.mapper.StoreAfterSalesStatusMapper;
 import co.yixiang.modules.sales.service.vo.StoreAfterSalesVo;
 import co.yixiang.modules.sales.service.vo.YxStoreOrderCartInfoVo;
 import co.yixiang.utils.FileUtil;
+import co.yixiang.utils.SecurityUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -309,6 +310,8 @@ public class StoreAfterSalesServiceImpl extends BaseServiceImpl<StoreAfterSalesM
                 storeAfterSales.setConsignee(consignee);
                 storeAfterSales.setPhoneNumber(phoneNumber);
                 storeAfterSales.setAddress(address);
+            } else {
+                this.makeMoney(storeAfterSales.getId(),storeAfterSales.getOrderCode());
             }
             //操作记录
             StoreAfterSalesStatus storeAfterSalesStatus = new StoreAfterSalesStatus();
@@ -316,8 +319,9 @@ public class StoreAfterSalesServiceImpl extends BaseServiceImpl<StoreAfterSalesM
             storeAfterSalesStatus.setChangeType(1);
             storeAfterSalesStatus.setChangeMessage("平台审核成功");
             storeAfterSalesStatus.setChangeTime(Timestamp.valueOf(LocalDateTime.now()));
-            storeAfterSalesStatus.setOperator("admin");
+            storeAfterSalesStatus.setOperator(SecurityUtils.getUsername());
             storeAfterSalesStatusMapper.insert(storeAfterSalesStatus);
+
         } else {
             storeAfterSales.setState(AfterSalesStatusEnum.STATUS_1.getValue());
             storeAfterSales.setSalesState(2);
@@ -327,10 +331,8 @@ public class StoreAfterSalesServiceImpl extends BaseServiceImpl<StoreAfterSalesM
             storeAfterSalesStatus.setChangeType(4);
             storeAfterSalesStatus.setChangeMessage("平台审核失败");
             storeAfterSalesStatus.setChangeTime(Timestamp.valueOf(LocalDateTime.now()));
-            storeAfterSalesStatus.setOperator("admin");
+            storeAfterSalesStatus.setOperator(SecurityUtils.getUsername());
             storeAfterSalesStatusMapper.insert(storeAfterSalesStatus);
-
-            this.makeMoney(storeAfterSales.getId(),storeAfterSales.getOrderCode());
         }
         return baseMapper.updateById(storeAfterSales) > 0;
     }
@@ -346,7 +348,7 @@ public class StoreAfterSalesServiceImpl extends BaseServiceImpl<StoreAfterSalesM
         storeAfterSalesStatus.setChangeType(3);
         storeAfterSalesStatus.setChangeMessage("平台打款成功");
         storeAfterSalesStatus.setChangeTime(Timestamp.valueOf(LocalDateTime.now()));
-        storeAfterSalesStatus.setOperator("admin");
+        storeAfterSalesStatus.setOperator(SecurityUtils.getUsername());
         storeAfterSalesStatusMapper.insert(storeAfterSalesStatus);
 
         YxStoreOrder yxStoreOrder = storeOrderMapper.selectOne(Wrappers.<YxStoreOrder>lambdaQuery().eq(YxStoreOrder::getOrderId, storeAfterSales.getOrderCode()));