From 165e0565b5b981f16083f1d2621e5cfe534d5d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Sat, 3 Jan 2026 14:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=93=E5=85=B7=E5=95=86=E5=9F=8E=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/Decorate.php      | 10 +++++++++-
 application/adminapi/controller/SystemMessage.php |  2 +-
 application/api/model/Decorate.php                | 10 +++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/application/adminapi/controller/Decorate.php b/application/adminapi/controller/Decorate.php
index c39a28b8..41acf95a 100644
--- a/application/adminapi/controller/Decorate.php
+++ b/application/adminapi/controller/Decorate.php
@@ -276,7 +276,15 @@ class Decorate extends adminApi
             return V(0,"该价格已存在");
         }
         //计算折扣取整
-        $discount = round($price/$original_price, 2)*10;
+        if($price==0 || $original_price==0){
+            $discount = 0;
+        }else{
+            $discount = round($price/$original_price, 2)*10;
+            if($discount >= 10){
+                $discount = 0;
+            }
+        }
+
         $data = [
             'did' => $did,
             'day' => $day,
diff --git a/application/adminapi/controller/SystemMessage.php b/application/adminapi/controller/SystemMessage.php
index 6ee570b6..f62c5a29 100644
--- a/application/adminapi/controller/SystemMessage.php
+++ b/application/adminapi/controller/SystemMessage.php
@@ -78,7 +78,7 @@ class SystemMessage extends adminApi
             $data['title'] = $title;
         }
 
-        $content = $_POST['content'] ?? '';
+        $content = input('content', ''); //$_POST['content'] ?? '';
         if($content){
             $data['content'] = $content;
         }
diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php
index 1a26c95d..35cb6bf9 100644
--- a/application/api/model/Decorate.php
+++ b/application/api/model/Decorate.php
@@ -87,12 +87,19 @@ class Decorate extends Model
                 ->order('price asc')
                 ->select();
         }else{
-            $list = DB::name($this->table)->alias('a')->join('fa_vs_decorate_price b', 'a.did = b.did')->field('a.did,a.title,a.type,a.base_image,a.play_image,min(b.price) as price,special_num')->where($map)->group('b.did')->order('price asc')->select();
+            $list = DB::name($this->table)
+                ->alias('a')->join('fa_vs_decorate_price b', 'a.did = b.did')
+                ->field('a.did,a.title,a.type,a.base_image,a.play_image,min(b.price) as price,special_num,b.original_price,b.discount')->where($map)->group('b.did')->order('price asc')->select();
         }
         foreach ($list as $k => &$v) {
             $v['base_image'] = localpath_to_netpath($v['base_image']);
             $v['play_image'] = localpath_to_netpath($v['play_image']);
             $v['price'] = (int)$v['price'];
+            if(isset($v['discount']) && ($v['discount']<=0 || $v['discount']>=10)){
+                $v['discount_str'] = "无折扣";
+            }else{
+                $v['discount_str'] = $v['discount']."折";
+            }
         }
         return ['code' => 1, 'msg' => '获取成功', 'data' => $list];
     }
@@ -115,6 +122,7 @@ class Decorate extends Model
             $result['title'] = $decorate['title'];
             foreach ($decorate_price as $k => $v) {
                 $result['price_list'][$k]['price'] = (int)$v['price'];
+                $result['price_list'][$k]['original_price'] = $v['original_price'];
                 $result['price_list'][$k]['discount'] = $v['discount'];
                 $result['price_list'][$k]['day'] = $v['day'];
                 //月