wugg преди 3 години
родител
ревизия
c762b24ddf
променени са 2 файла, в които са добавени 63 реда и са изтрити 16 реда
  1. 17 11
      app/admin/controller/Consult.php
  2. 46 5
      app/admin/controller/Project.php

+ 17 - 11
app/admin/controller/Consult.php

@@ -175,18 +175,22 @@ class Consult extends BaseController
         if($khNo===""){
             return error_show(1002,"参数khNo不能为空");
         }
+        $companyNo =  isset($this->post['companyNo']) && $this->post['companyNo'] !=="" ? trim($this->post['companyNo']) : "";
+        if($companyNo===""){
+            return error_show(1002,"参数companyNo不能为空");
+        }
         $endtime =  isset($this->post['endtime']) && $this->post['endtime'] !=="" ? $this->post['endtime'] : "";
         if($endtime===""){
             return error_show(1002,"参数endtime不能为空");
         }
-        $saleid =  isset($this->post['saleid']) && $this->post['saleid'] !=="" ? intval($this->post['saleid']) : "";
-        if($saleid===""){
-            return error_show(1002,"参数saleid不能为空");
-        }
-        $depart =  isset($this->post['depart']) && $this->post['depart'] !=="" ? intval($this->post['depart']) : "";
-        if($depart===""){
-            return error_show(1002,"参数depart不能为空");
-        }
+//        $saleid =  isset($this->post['saleid']) && $this->post['saleid'] !=="" ? intval($this->post['saleid']) : "";
+//        if($saleid===""){
+//            return error_show(1002,"参数saleid不能为空");
+//        }
+//        $depart =  isset($this->post['depart']) && $this->post['depart'] !=="" ? intval($this->post['depart']) : "";
+//        if($depart===""){
+//            return error_show(1002,"参数depart不能为空");
+//        }
         $platform_code =  isset($this->post['platform_code']) && $this->post['platform_code'] !=="" ? trim($this->post['platform_code']) :
             "";
         if($platform_code===""){
@@ -202,6 +206,7 @@ class Consult extends BaseController
         }
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
+        $depart= Db::name("depart_user")->where(["uid"=>$createrid,"status"=>1,"is_del"=>0])->find();
         $zxNo=makeNo("ZX");
         $data=[
             "zxNo"=>$zxNo,
@@ -210,11 +215,12 @@ class Consult extends BaseController
             "is_project"=>$is_project,
             "projectNo"=>isset($projectNo) ? $projectNo:"",
             "khNo"=>$khNo,
+            "companyNo"=>$companyNo,
             "endtime"=>$endtime,
-            "salesman"=>"",
+            "salesman"=>$creater,
             "platform_code"=>$platform_code,
-            "saleid"=>$saleid,
-            "depart"=>$depart,
+            "saleid"=>$createrid,
+            "depart"=>isset($depart['itemid'])?$depart['itemid']:0,
             "status"=>0,
             "is_del"=>0,
             "addtime"=>date("Y-m-d H:i:s"),

+ 46 - 5
app/admin/controller/Project.php

@@ -530,7 +530,9 @@ class Project extends \app\BaseController
             $rm = isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
             $ri = isset($apply_id["data"]['nickname']) ? $apply_id["data"]['nickname'] : "";
         $orderCode = makeNo("CX");
-        $data = [
+        Db::startTrans();
+        try{
+            $data = [
             "orderCode" => $orderCode,
             "good_code" => $backinfo['spuCode'],
             "customer_code" => $prject['khNo'],
@@ -556,10 +558,49 @@ class Project extends \app\BaseController
             "updatetime" => date("Y-m-d H:i:s"),
             'total_price' => $backinfo['sale_price'] * $backinfo['num'],
         ];
-        $datainfo = Db::name('sale')->insert($data, true);
-        if($datainfo>0){
-
+            $datainfo = Db::name('sale')->insert($data, true);
+            if($datainfo>0){
+                if($send_type==1){
+                    foreach ($va as $value) {
+                        $temp = [];
+                        $addrs = [];
+                        if ($value['addr_code'] !== '' && is_array($value['addr_code'])) {
+                            $addrs['provice_code'] = $value['addr_code'][0];
+                            $addrs['city_code'] = $value['addr_code'][1];
+                            $addrs['area_code'] = $value['addr_code'][2];
+                            $addr = json_encode($addrs);
+                        } else {
+                            $addr = isset($value['addr_code']) ? $value['addr_code'] : '';
+                        }
+                        $temp['orderCode'] = $orderCode;
+                        $temp['contactor'] = $value['contactor'];
+                        $temp['mobile'] = $value['mobile'];
+                        $temp['addr'] = $value['addr'];
+                        $temp['addr_code'] = $addr;
+                        $temp['customer_code'] = $prject['khNo'];
+                        $temp['receipt_quantity'] = $value['receipt_quantity'];
+                        $temp['post_fee'] = 0;
+                        $temp['is_del'] = 0;
+                        $temp['addtime'] = date("Y-m-d H:i:s");
+                        $temp['updatetime'] = date("Y-m-d H:i:s");
+                        $temp['arrive_time'] = date("Y-m-d H:i:s");
+                        $vat[] = $temp;
+                    }
+                    $vmp = Db::name('order_addr')->insertAll($vat);
+                    if ($vmp==false) {
+                        Db::rollback();
+                        return error_show(1004, "销售订单创建失败");
+                    }
+                }
+                Db::commit();
+                return error_show(0, "销售订单创建成功");
+            }
+            Db::rollback();
+            return error_show(1004, "销售订单创建失败");
+        }catch (\Exception $w){
+            Db::rollback();
+            return error_show(1004, $w->getMessage());
         }
-
     }
+
 }