Merge branch 'hcy_pcb_20181221-r' into development

app/Http/Controllers/WebController.php

@@ -204,10 +204,6 @@ class WebController extends Controller
 
         //拼接基本信息
         $orderBase =  objectToArray($orderBase);
-        $orderBase['tiaojia'] = "";
-        if (!$purchase){
-            $orderBase['tiaojia'] = $purchase['purchase_amount'] != $purchase['order_amount'] ? "是" :"否"; //是否调价、
-        }
         $orderBase['order_type'] = PcbOrderMap::$order_type[$orderBase['order_type']];
         $orderBase['status_name'] = PcbOrderMap::$status[$orderBase['status']];
         $orderBase['create_time'] = $orderBase['create_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['create_time']) : "";
@@ -222,6 +218,15 @@ class WebController extends Controller
             $purchase['shipping_time'] = $purchase['shipping_time'] > 0 ? date('Y-m-d H:i:s',$purchase['shipping_time']) : "";
             $purchase['purchase_amount'] = $purchase['purchase_amount'] > 0 ? $purchase['purchase_amount'] : "";
             $purchase['order_pay_type'] = PcbOrderMap::$order_pay_type[$purchase['order_pay_type']];
+            if($purchase['purchase_amount'] == 0){
+                $orderBase['tiaojia'] = "";
+            }else{
+                if ( $purchase['purchase_amount'] > 0  &&  $purchase['purchase_amount'] != $purchase['order_amount']){
+                    $orderBase['tiaojia'] = "是";
+                }else{
+                    $orderBase['tiaojia'] = "否";
+                }
+            }
         }
         //拼接订单详细信息
         $orderInfo = objectToArray($orderInfo);

app/Model/Pcb/PcbOrderModel.php

@@ -76,16 +76,18 @@ class PcbOrderModel extends Model
         $con = DB::connection("pcb");
         foreach ($data as $k=>&$v){
             //查询采购
-            $puchase = $PcbPurchaseModel->where("order_id",$v['order_id'])->first();
+            $purchase = $PcbPurchaseModel->where("order_id",$v['order_id'])->first();
             $v['tiaojia']=$v['purchase_amount'] = $v['purchase_sn'] = "";
-            if ($puchase){
-                if ( $puchase['purchase_amount'] > 0  &&  $puchase['purchase_amount'] != $v['order_amount']){
+            if ($purchase){
+                if ( $purchase['purchase_amount'] > 0  &&  $purchase['purchase_amount'] != $v['order_amount']){
                     $v['tiaojia'] = "是";
+                }elseif($purchase['purchase_amount'] == 0){
+                    $v['tiaojia'] = "";
                 }else{
                     $v['tiaojia'] = "否";
                 }
-                $v['purchase_amount'] = $puchase['purchase_amount'] > 0 ? $puchase['purchase_amount'] : "";
-                $v['purchase_sn'] = $puchase['purchase_sn'];
+                $v['purchase_amount'] = $purchase['purchase_amount'] > 0 ? $purchase['purchase_amount'] : "";
+                $v['purchase_sn'] = $purchase['purchase_sn'];
             }
             //查询支付
             $v['order_pay_type'] = $PcbPublicModel->getPay($v['order_id']);