From 1f3b87e6ef6d777a1feb9c26d1e0994b2659a757 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 9 May 2024 18:45:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BC=98=E6=83=A0=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/PatientOrderService.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index 67dcfd6..31f1688 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -647,11 +647,8 @@ class PatientOrderService extends BaseService
         }
 
         // 处理优惠金额
-        $order_product['discount_amount'] = bcsub(
-            (string)$order_product['amount_total'],
-            (string)$order_product['payment_amount_total'],
-            2
-        );
+        $order_product['discount_amount'] = $order_product['amount_total'] - $order_product['coupon_amount_total'] - $order_product['payment_amount_total'] - $order_product['logistics_fee']; // 优惠金额
+
 
         $result = array();
         $result['user_doctor'] = $user_doctor ?? [];
@@ -801,7 +798,6 @@ class PatientOrderService extends BaseService
         $result['pay_config'] = []; // 小程序支付配置
         $result['cannot_use_coupon_reason'] = ""; // 不可使用优惠卷原因
 
-
         // 问诊订单
         if ($order_type == 1) {
             $params = array();
@@ -923,7 +919,7 @@ class PatientOrderService extends BaseService
             $result['amount_total'] = $order_product['amount_total']; // 订单金额
             $result['payment_amount_total'] = $order_product['payment_amount_total']; // 实际订单金额
             $result['coupon_amount_total'] = $order_product['coupon_amount_total']; // 优惠金额
-            $result['discount_amount'] = $order_product['amount_total'] - $order_product['coupon_amount_total'] - $order_product['payment_amount_total']; // 优惠金额
+            $result['discount_amount'] = $order_product['amount_total'] - $order_product['coupon_amount_total'] - $order_product['payment_amount_total'] - $order_product['logistics_fee']; // 优惠金额
 
             // 获取优惠卷不可用原因。存在优惠卷，但是未使用-暂时废弃
             /*if ($order_product['coupon_amount_total'] == 0){