From 031b44dec8aefc4212303c220f0d6f52a82886e4 Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Sat, 17 Jun 2023 13:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8Ebugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 .../co/yixiang/modules/sales/StoreAfterSalesController.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 39889da9..03810e64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.10</version>
+        <version>2.7.12</version>
     </parent>
 
     <properties>
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java b/yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java
index 49cb5acf..acacd846 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java
@@ -67,7 +67,7 @@ public class StoreAfterSalesController {
                 .eq(StoreAfterSales::getOrderCode, salesCheckDto.getOrderCode())
                 .eq(StoreAfterSales::getId, salesCheckDto.getSalesId())
                 .one();
-        if (storeAfterSales.getServiceType() == 0) {
+        if (salesCheckDto.getApprovalStatus().equals(0) && storeAfterSales.getServiceType() == 0) {
             BigDecimal bigDecimal = new BigDecimal("100");
             int payPrice = bigDecimal.multiply(storeAfterSales.getRefundAmount()).intValue();
             YxStoreOrderQueryVo orderInfo = storeOrderService.getOrderInfo(salesCheckDto.getOrderCode(), null);