From ae26fc531064f241ab710c706b0fde6ce7fc4a18 Mon Sep 17 00:00:00 2001
From: zengchaoxin <zengchaoxin@gmail.com>
Date: Wed, 23 Oct 2019 14:53:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E9=80=80?=
 =?UTF-8?q?=E5=9B=9E=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/models/OrderGiftT.php               |  2 +-
 frontend/controllers/BaseController.php    |  2 +-
 frontend/controllers/InsurerController.php | 22 ++++++++--------------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/common/models/OrderGiftT.php b/common/models/OrderGiftT.php
index a8b0b15..88c902b 100644
--- a/common/models/OrderGiftT.php
+++ b/common/models/OrderGiftT.php
@@ -84,6 +84,6 @@ class OrderGiftT extends \common\models\Base
 
     public function getGift()
     {
-        return $this->hasOne(GiftType3T::className(),['id'=>'gift_id']);
+        return $this->hasOne(GiftT::className(),['id'=>'gift_id']);
     }
 }
diff --git a/frontend/controllers/BaseController.php b/frontend/controllers/BaseController.php
index bf90dc0..23d54a5 100644
--- a/frontend/controllers/BaseController.php
+++ b/frontend/controllers/BaseController.php
@@ -61,7 +61,7 @@ class BaseController extends \yii\web\Controller
         $log_info->remark = $info;
         $log_info->info = '';
         if(!$log_info->save()) {
-            var_dump($log_info->errors);
+            throw new \Exception(print_r($log_info->getErrors(), true));
         }
     }
     public function addNonLog($non_id,$info,$type)
diff --git a/frontend/controllers/InsurerController.php b/frontend/controllers/InsurerController.php
index f76b3c2..a0e865e 100644
--- a/frontend/controllers/InsurerController.php
+++ b/frontend/controllers/InsurerController.php
@@ -3344,31 +3344,25 @@ class InsurerController extends BaseController
                 $row->return_remark = $return_remark;
                 $row->return_time = time();
                 $row->lock_id = 0;
-                $row->save();
+                if(!$row->save()) {
+                    throw new \Exception(print_r($row->getErrors(), true));
+                }
 
                 //处理操作人员状态
                 $order_user_info = OrderUserT::findOne(['order_id'=>$row->id,'user_id'=>$this->my->id,'status'=>0]);
                 if($order_user_info) {
                     $order_user_info->status = 2; //退回
-                    $order_user_info->save();
+                    if(!$order_user_info->save()) {
+                        throw new \Exception(print_r($order_user_info->getErrors(), true));
+                    }
 
                     $order_user_info2 = new OrderUserT();
                     $order_user_info2->user_id = $row->user_id;
                     $order_user_info2->order_id = $row->id;
                     $order_user_info2->type_id = 1;
                     $order_user_info2->status = 0;
-                    $order_user_info2->save();
-                }
-                //
-                //处理礼品数量
-                $sel_gifts = OrderGiftT::find()
-                    ->where('order_id='.$order_id)
-                    ->all();
-                foreach($sel_gifts as $sel_gift) {
-                    $gift_info = $sel_gift->gift;
-                    if($gift_info && $gift_info->total > -1) {
-                        $gift_info->total = $gift_info->total + 1;
-                        $gift_info->save();
+                    if(!$order_user_info2->save()) {
+                        throw new \Exception(print_r($order_user_info2->getErrors(), true));
                     }
                 }