From f6727c5bf73a42b66278307f75c0e092be814b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Mon, 10 May 2021 19:02:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/user/controller/User.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/user/controller/User.php b/app/user/controller/User.php
index 0c37880..130c775 100644
--- a/app/user/controller/User.php
+++ b/app/user/controller/User.php
@@ -36,6 +36,7 @@ class User extends Controller
         $discount_data = $discount_model->getList();
         $discount_list = [];
         $discount_list[0] = '原价';
+        $discount_list[-1] = '专项优惠';
         foreach($discount_data as $info) {
             $discount_list[$info['Id']] = $info['Name'];
         }
@@ -309,7 +310,7 @@ class User extends Controller
             $discount_list[$info['Id']] = $info["discount"];
         }
 
-        if($user_info['discount_id'] != 0){
+        if($user_info['discount_id'] != 0 &&$user_info['discount_id'] != -1){
             if($discount_list[$data['schemeId']]>$discount_list[$user_info['discount_id']]){
                 $info = [
                     'Code' => -10000,