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