From e7cb8fe16398b85c9687523d41c06ec54ecb7921 Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Tue, 7 Apr 2020 18:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=92=8C=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E9=98=B2=E6=AD=A2=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/BuyService.php            | 8 ++++----
 application/service/OrderAftersaleService.php | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/application/service/BuyService.php b/application/service/BuyService.php
index b9c36eb2c..19c5e331b 100755
--- a/application/service/BuyService.php
+++ b/application/service/BuyService.php
@@ -760,10 +760,10 @@ class BuyService
             }
 
             // 返回数据再次处理，防止插件处理不够完善
-            $result['base']['total_price'] = PriceNumberFormat($result['base']['total_price']);
-            $result['base']['actual_price'] = PriceNumberFormat($result['base']['actual_price']);
-            $result['base']['preferential_price'] = PriceNumberFormat($result['base']['preferential_price']);
-            $result['base']['increase_price'] = PriceNumberFormat($result['base']['increase_price']);
+            $result['base']['total_price'] = ($result['base']['total_price'] <= 0) ? 0.00 : PriceNumberFormat($result['base']['total_price']);
+            $result['base']['actual_price'] = ($result['base']['actual_price'] <= 0) ? 0.00 : PriceNumberFormat($result['base']['actual_price']);
+            $result['base']['preferential_price'] = ($result['base']['preferential_price'] <= 0) ? 0.00 : PriceNumberFormat($result['base']['preferential_price']);
+            $result['base']['increase_price'] = ($result['base']['increase_price'] <= 0) ? 0.00 : PriceNumberFormat($result['base']['increase_price']);
 
             return DataReturn('操作成功', 0, $result);
         }
diff --git a/application/service/OrderAftersaleService.php b/application/service/OrderAftersaleService.php
index 4fe9b8e9a..b8d84a076 100644
--- a/application/service/OrderAftersaleService.php
+++ b/application/service/OrderAftersaleService.php
@@ -1423,6 +1423,12 @@ class OrderAftersaleService
             {
                 $refund_price = $order['pay_price']-$history_refund_price;
             }
+
+            // 防止负数
+            if($refund_price <= 0)
+            {
+                $refund_price = 0.00;
+            }
         }
 
         return DataReturn('操作成功', 0, ['returned_quantity'=>$returned_quantity, 'refund_price'=>PriceNumberFormat($refund_price)]);