From a5e8a3a6788e27bdb01b8b24f58ac438ecef7402 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 30 Apr 2024 16:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA=E8=8D=AF?=
 =?UTF-8?q?=E5=93=81=E8=AE=A2=E5=8D=95+=E6=94=AF=E4=BB=98=E9=A1=B5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E8=8D=AF=E5=93=81=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=971?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/PatientOrderService.php |  4 ++--
 app/Services/UserCouponService.php   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index 91d0e48..b918479 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -1553,7 +1553,7 @@ class PatientOrderService extends BaseService
                     $product_datas[$key]['used_quantity'] = $product_data['product_num'];
 
                     // 实际药品数量 = 处方数量 - 健康包可使用的赠送药品数量
-                    $product_data['actual_quantity'] = 0;
+                    $product_data[$key]['actual_quantity'] = 0;
                 } else {
                     // 已使用数量 = 最大可用数量;表示此服务包商品已使用完毕
                     $product_datas[$key]['used_quantity'] = $remaining_quantity;
@@ -1567,7 +1567,7 @@ class PatientOrderService extends BaseService
                     $amount_total,
                     bcmul(
                         $product_datas[$key]['product_price'],
-                        $product_data['actual_quantity'],
+                        $product_data[$key]['actual_quantity'],
                         2
                     ),
                     2
diff --git a/app/Services/UserCouponService.php b/app/Services/UserCouponService.php
index 1e1f3f6..03e4664 100644
--- a/app/Services/UserCouponService.php
+++ b/app/Services/UserCouponService.php
@@ -326,7 +326,7 @@ class UserCouponService extends BaseService
                         }
 
                         // 判断商品数量是否满足
-                        if($coupon['min_usable_number'] > $coupon_product_data['product_num']){
+                        if($coupon['min_usable_number'] > $coupon_product_data['actual_quantity']){
                             continue;
                         }
 
@@ -340,13 +340,13 @@ class UserCouponService extends BaseService
                 // 全场通用/全品类药品
                 if ($coupon['application_scope'] == 1 || $coupon['application_scope'] == 6){
                     // 获取总商品数量
-                    $product_num = 0;
+                    $actual_quantity = 0;
                     foreach ($coupon_product_datas as $coupon_product_data){
-                        $product_num = $product_num + $coupon_product_data['product_num'];
+                        $actual_quantity = $actual_quantity + $coupon_product_data['actual_quantity'];
                     }
 
                     // 判断商品数量是否满足
-                    if($coupon['min_usable_number'] > $product_num){
+                    if($coupon['min_usable_number'] > $actual_quantity){
                         continue;
                     }
 
@@ -391,7 +391,7 @@ class UserCouponService extends BaseService
                         $product_price = bcadd($product_price,
                             bcmul( // 商品价格*数量
                                 $coupon_product_data['product_price'],
-                                $coupon_product_data['product_num'],
+                                $coupon_product_data['actual_quantity'],
                                 2
                             ),
                             2
@@ -406,7 +406,7 @@ class UserCouponService extends BaseService
                         $product_price = bcadd($product_price,
                             bcmul( // 商品价格*数量
                                 $coupon_product_data['product_price'],
-                                $coupon_product_data['product_num'],
+                                $coupon_product_data['actual_quantity'],
                                 2
                             ),
                             2