From 049d11c20106e007dc05b296b2fe0f4dc30ae9ef Mon Sep 17 00:00:00 2001
From: liqi <qiqiqiyoucili@163.com>
Date: Wed, 25 Dec 2024 11:33:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AB=AF=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=EF=BC=8C=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/controllers/base/OrderController.php  |  2 +-
 common/foundation/JsonResponseFormatter.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/controllers/base/OrderController.php b/admin/controllers/base/OrderController.php
index 2920492..2f5afc2 100644
--- a/admin/controllers/base/OrderController.php
+++ b/admin/controllers/base/OrderController.php
@@ -345,7 +345,7 @@ class OrderController extends BaseAdminController
         if (!$ProductOrder) throw new Exception('产品订单不存在');
 
         $Prescription=Prescription::find()->where(['id'=>$ProductOrder['p_id'],'is_deleted'=>0])->one();
-        if ($Prescription['status']!=1){
+        if ($Prescription['status']!=1 && $Prescription['status']!=4){
             throw new Exception('处方未通过，不能发货');
         }
         $ProductOrder->is_send = 1;
diff --git a/common/foundation/JsonResponseFormatter.php b/common/foundation/JsonResponseFormatter.php
index e97145f..e5fb2c3 100644
--- a/common/foundation/JsonResponseFormatter.php
+++ b/common/foundation/JsonResponseFormatter.php
@@ -18,11 +18,11 @@ class JsonResponseFormatter extends \yii\web\JsonResponseFormatter
         if (empty($data)) {
             $data = [];
         } else {
-//            if (array_key_exists('list', $data)) {
-//                $data['list'] = self::aseEncode($data['list']);
-//            } else {
-//                $data = self::aseEncode($data);
-//            }
+            if (array_key_exists('list', $data)) {
+                $data['list'] = self::aseEncode($data['list']);
+            } else {
+                $data = self::aseEncode($data);
+            }
         }
 
         return ['data'=>$data,'errcode'=>$errno,'msg'=>$msg];