From e309d31e7af5dba25854d476da3f3a09eac83292 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 12 Apr 2024 17:00:38 +0800
Subject: [PATCH] 1

---
 app/Model/HealthPackage.php        | 7 ++++---
 app/Model/HealthPackageProduct.php | 7 ++++---
 app/Services/OrderService.php      | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Model/HealthPackage.php b/app/Model/HealthPackage.php
index 46ee69c..902d8b2 100644
--- a/app/Model/HealthPackage.php
+++ b/app/Model/HealthPackage.php
@@ -16,8 +16,9 @@ use Hyperf\Snowflake\Concern\Snowflake;
  * @property int $monthly_frequency 每月次数
  * @property string $effective_days 服务有效天数
  * @property string $service_rate 服务费率。100为满值，表示1，正常费率。
- * @property Carbon $created_at 创建时间
- * @property Carbon $updated_at 修改时间
+ * @property string $discount_product_total_amount 折扣商品总价格
+ * @property \Carbon\Carbon $created_at 创建时间
+ * @property \Carbon\Carbon $updated_at 修改时间
  */
 class HealthPackage extends Model
 {
@@ -31,7 +32,7 @@ class HealthPackage extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected array $fillable = ['package_id', 'service_count', 'monthly_frequency', 'effective_days', 'service_rate', 'created_at', 'updated_at'];
+    protected array $fillable = ['package_id', 'service_count', 'monthly_frequency', 'effective_days', 'service_rate', 'discount_product_total_amount', 'created_at', 'updated_at'];
 
     protected string $primaryKey = "package_id";
 
diff --git a/app/Model/HealthPackageProduct.php b/app/Model/HealthPackageProduct.php
index 1740a3b..d745282 100644
--- a/app/Model/HealthPackageProduct.php
+++ b/app/Model/HealthPackageProduct.php
@@ -15,8 +15,9 @@ use Hyperf\Snowflake\Concern\Snowflake;
  * @property int $package_id 健康包id
  * @property int $product_id 商品id
  * @property int $quantity 数量
- * @property Carbon $created_at 创建时间
- * @property Carbon $updated_at 修改时间
+ * @property string $discount_product_price 折扣商品价格
+ * @property \Carbon\Carbon $created_at 创建时间
+ * @property \Carbon\Carbon $updated_at 修改时间
  */
 class HealthPackageProduct extends Model
 {
@@ -30,7 +31,7 @@ class HealthPackageProduct extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected array $fillable = ['package_product_id', 'package_id', 'product_id', 'quantity', 'created_at', 'updated_at'];
+    protected array $fillable = ['package_product_id', 'package_id', 'product_id', 'quantity', 'discount_product_price', 'created_at', 'updated_at'];
 
     protected string $primaryKey = "package_product_id";
 
diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php
index 54706c3..804a0c8 100644
--- a/app/Services/OrderService.php
+++ b/app/Services/OrderService.php
@@ -952,7 +952,7 @@ class OrderService extends BaseService
                     }
 
                     // 检测订单状态
-                    if (!in_array($order_inquiry['inquiry_status'], [4, 5, 6])) {
+                    if (in_array($order_inquiry['inquiry_status'], [4, 5, 6])) {
                         // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
                         $result['status'] = 0;
                         $result['message'] = "已存在问诊订单，无法手动取消";