Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Good.php

@@ -145,6 +145,7 @@ class Good extends \app\BaseController
             $value['company'] = isset($company['company'])?$company['company']:"";
             $value['stock_total'] = Db::name("good_stock")->where(['spuCode'=>$value['spuCode'],"is_del"=>0])->sum("usable_stock");
             $value['status']=$value['exam_status'];
+            $value['good_info_img']=json_decode($value['good_info_img'],true);
             $spec = Db::name("good_spec")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->select()->toArray();
             $speclist=[];
             if(!empty($spec)){

app/admin/controller/Goodup.php

@@ -93,6 +93,7 @@ class Goodup extends BaseController
                 $value['company'] = isset($company['company'])?$company['company']:"";
                 $supplier = Db::name("supplier")->where(['code'=>$value['supplierNo']])->find();
                 $value['supplier_name']=isset($supplier['name'])?$supplier['name']:"";
+                $value['good_info_img']=json_decode($value['good_info_img'],true);
 //                $value['status']=$value['exam_status'];
                 $data[]=$value;
         }

app/admin/controller/Sale.php

@@ -200,6 +200,23 @@ class Sale extends BaseController
                         Db::rollback();
                         return error_show(1002,"咨询订单创建失败");
                     }
+                }else{
+                    $dd=[
+                        "orderCode"=>$orderCode,
+                        "spuCode"=>$spuCode,
+                        "total_num"=>$good_num,
+                        "merge_num"=>0,
+                        "balance_num"=>$good_num,
+                        "status"=>1,
+                        "is_del"=>0,
+                        "addtime"=>date("Y-m-d H:i:s"),
+                        "updatetime"=>date("Y-m-d H:i:s"),
+                    ];
+                    $db=Db::name("sale_bk")->insert($dd);
+                    if($db==false){
+                        Db::rollback();
+                        return error_show(1002,"咨询订单创建失败");
+                    }
                 }
                 if($sendtype==1){
                     foreach ($addrlist as $value){