From bc48169ff9fbf0309764715f4769a0d0d3e499cb Mon Sep 17 00:00:00 2001
From: winzer <winzer9527@163.com>
Date: Wed, 3 Feb 2021 15:52:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=B7=E6=A0=BC=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 3d286baf91e1c6130ebb1db7831d4bb01c8b06e8)
---
 app/Http/Admin/Services/Course.php | 3 +--
 app/Validators/Course.php          | 9 +--------
 config/errors.php                  | 3 +--
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/Http/Admin/Services/Course.php b/app/Http/Admin/Services/Course.php
index 59e06038..1767f553 100644
--- a/app/Http/Admin/Services/Course.php
+++ b/app/Http/Admin/Services/Course.php
@@ -164,10 +164,9 @@ class Course extends Service
                 $data['market_price'] = 0;
                 $data['vip_price'] = 0;
             } else {
-                $data['origin_price'] = $validator->checkMarketPrice($post['origin_price']);
+                $data['origin_price'] = $validator->checkOriginPrice($post['origin_price']);
                 $data['market_price'] = $validator->checkMarketPrice($post['market_price']);
                 $data['vip_price'] = $validator->checkVipPrice($post['vip_price']);
-                $validator->checkComparePrice($post['market_price'], $post['vip_price']);
                 $data['study_expiry'] = $validator->checkStudyExpiry($post['study_expiry']);
                 $data['refund_expiry'] = $validator->checkRefundExpiry($post['refund_expiry']);
             }
diff --git a/app/Validators/Course.php b/app/Validators/Course.php
index 83c1ab08..24ed7e96 100644
--- a/app/Validators/Course.php
+++ b/app/Validators/Course.php
@@ -161,7 +161,7 @@ class Course extends Validator
         return implode('，', $list);
     }
 
-    public function checkGuidePrice($price)
+    public function checkOriginPrice($price)
     {
         $value = $this->filter->sanitize($price, ['trim', 'float']);
 
@@ -194,13 +194,6 @@ class Course extends Validator
         return $value;
     }
 
-    public function checkComparePrice($marketPrice, $vipPrice)
-    {
-        if ($vipPrice > $marketPrice) {
-            throw new BadRequestException('course.invalid_compare_price');
-        }
-    }
-
     public function checkStudyExpiry($expiry)
     {
         $options = CourseModel::studyExpiryOptions();
diff --git a/config/errors.php b/config/errors.php
index 886b5bc5..ca812440 100644
--- a/config/errors.php
+++ b/config/errors.php
@@ -109,10 +109,9 @@ $error['course.details_too_long'] = '详情太长（多于5000个字符）';
 $error['course.invalid_model'] = '无效的模型类别';
 $error['course.invalid_level'] = '无效的难度级别';
 $error['course.invalid_cover'] = '无效的封面';
-$error['course.invalid_origin_price'] = '无效的指导价格（范围：0-10000）';
+$error['course.invalid_origin_price'] = '无效的原始价格（范围：0-10000）';
 $error['course.invalid_market_price'] = '无效的优惠价格（范围：0-10000）';
 $error['course.invalid_vip_price'] = '无效的会员价格（范围：0-10000）';
-$error['course.invalid_compare_price'] = '无效的比较定价（会员价格高于优惠价格）';
 $error['course.invalid_study_expiry'] = '无效的学习期限';
 $error['course.invalid_refund_expiry'] = '无效的退款期限';
 $error['course.invalid_feature_status'] = '无效的推荐状态';