From b4d4b022c8285f832a8eec63fe09a48af1219ea8 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Mon, 21 Nov 2022 12:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/CropYieldController.php | 6 +++++-
 app/Http/Resources/CropYieldListResource.php | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/CropYieldController.php b/app/Http/Controllers/CropYieldController.php
index 08f0121..e3def5f 100644
--- a/app/Http/Controllers/CropYieldController.php
+++ b/app/Http/Controllers/CropYieldController.php
@@ -160,7 +160,11 @@ class CropYieldController extends Controller
             $staticCropIds[] = $crop->id;
             if ($crop->extends) {
                 $i = 0;
-                $extends = json_decode($crop->extends, true);
+                if(is_array($crop->extends)){
+                    $extends = $crop->extends;
+                }else{
+                    $extends = json_decode($crop->extends, true);
+                }
                 foreach ($extends as $item) {
                     $i++;
                     $_key = 'extend_'.$i;
diff --git a/app/Http/Resources/CropYieldListResource.php b/app/Http/Resources/CropYieldListResource.php
index c298015..6e8c764 100644
--- a/app/Http/Resources/CropYieldListResource.php
+++ b/app/Http/Resources/CropYieldListResource.php
@@ -29,8 +29,8 @@ class CropYieldListResource extends JsonResource
             'yield' => $this->formatNumber($this->yield).$this->whenLoaded('crop', function () {
                 return $this->crop?->unit;
             }, ''),
-            'output' => $this->formatNumber($this->output),
-            'cultivated' => $this->formatNumber($this->cultivated),
+            'output' => $this->formatNumber($this->output).'元',
+            'cultivated' => $this->formatNumber($this->cultivated).'亩',
             'extends' => $this->extends,
             'created_by' => $this->whenLoaded('createdBy', function () {
                 return $this->createdBy?->name;