ad

app/admin/controller/Sale.php

@@ -263,11 +263,11 @@ class Sale extends BaseController
     $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"";
 
     $vr= isset($this->post['order_addr']) && $this->post['order_addr'] !=="" ?  $this->post['order_addr']:"";
-    if($vr=="" &&$etid['order_type']==1 ){
+    if($vr=="" ){
         return error_show(1002,"参数order_addr不能为空");
     }
     $vi= isset($this->post['good_stock']) && $this->post['good_stock'] !=="" ?  $this->post['good_stock']:"";
-    if($vi=="" &&$etid['send_type']==1){
+    if($vi==""){
         return error_show(1002,"参数good_stock不能为空");
     }
     Db::startTrans();
@@ -290,7 +290,7 @@ class Sale extends BaseController
         ];
         $datninfo = Db::name('sale')->where(['id'=>$id,'is_del'=>0])->save($datn);
         if($datninfo>0){
-            if($etid['order_type']==1) {
+
                 foreach ($vi as $ion) {
                     $iten = [];
                     isset($ion['id']) && $ion['id'] !== "" ? $iten['id'] = $ion['id'] : '';
@@ -304,9 +304,13 @@ class Sale extends BaseController
                     $iten['updatetime'] = date("Y-m-d H:i:s");
                     //$inn[]=$iten;
                     $vp = Db::name('sale_info')->save($iten);
+                    if ($vp == false) {
+                        Db::rollback();
+                        return error_show(1002, "更新失败");
+                    }
                 }
-            }
-            if($etid['send_type']==1){
+
+
                 foreach ($vr as $value) {
                     $temp = [];
                     isset($value['id']) && $value['id'] !== "" ? $temp['id'] = $value['id'] : '';
@@ -328,7 +332,7 @@ class Sale extends BaseController
                         return error_show(1002, "更新失败");
                     }
                 }
-            }
+
             Db::commit();
             return error_show(0,"更新成功");
         }
@@ -871,7 +875,7 @@ class Sale extends BaseController
         if($customer_remark===''){
             return error_show(1004,"参数customer_remark不能为空");
         }
-        $status = isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']):"";
+        $status = isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']):"2";
         $remark = isset($this->post['remark']) && $this->post['remark'] !==""? trim($this->post['remark']):"";
         $info['is_act'] =$is_act;
         $info['customer_remark'] =$customer_remark;
@@ -901,7 +905,7 @@ class Sale extends BaseController
         if(empty($info)){
             return error_show(1004,"订单数据未找到");
         }
-        $status = isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']):"";
+        $status = isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']):"3";
         $remark = isset($this->post['remark']) && $this->post['remark'] !==""? trim($this->post['remark']):"";
         $info['status'] =$status;
         $info['remark'] =$remark;

app/admin/controller/Salezx.php

@@ -81,7 +81,7 @@ class Salezx extends \app\BaseController
                 "apply_id"=>$rm,
                 "apply_name"=>$ri,
                 "origin_price"=>$zxinfo['sale_fee'],
-                "sale_price"=>$zxinfo['sale_fee'],
+                "sale_price"=>$zxinfo['last_price'],
                 "post_fee"=>$zxinfo['delivery_fee'],
                 "status"=>0,
                 "send_num"=>0,
@@ -227,8 +227,134 @@ class Salezx extends \app\BaseController
         return false;
     }
 
-//    public function CgdAdd($data){
-//        $cgNo = makeNo("CG");
-//
-//    }
+    public function edit(){
+        $token = isset($this->post['token']) && $this->post['token'] !=="" ?trim($this->post['token']):"";
+
+        $zxNo=isset($this->post['id']) && $this->post['id'] !=="" ?intval($this->post['id']):"";
+        if($zxNo==''){
+            return error_show(1004,"参数id不能为空");
+        }
+        $saleinfo = Db::name("sale")->where(["id"=>$zxNo,"is_del"=>0])->find();
+        if($saleinfo==false){
+            return error_show(1003,"未找到咨询单数据");
+        }
+        $zxinfo = Db::name("consult")->where(["zxNo"=>$saleinfo['zxNo'],"is_del"=>0])->find();
+        if($zxinfo==false){
+            return error_show(1004,"未找到咨询单数据");
+        }
+        $customer_code= $this->post['customer_code'] && $this->post['customer_code'] !=="" ? trim($this->post['customer_code']) :"";
+        if($customer_code==""){
+            return error_show(1002,"客户code不能为空");
+        }
+        $customer=Db::name("customer_info")->where(["companyNo"=>$customer_code])->find();
+        if($customer==false){
+            return error_show(1004,"未找到客户数据");
+        }
+        $supplierNo= $this->post['supplierNo'] && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
+        if($supplierNo==""){
+            return error_show(1002,"参数supplierNo不能为空");
+        }
+        $supplier=Db::name("supplier")->where(["code"=>$supplierNo])->find();
+        if($supplier==false){
+            return error_show(1004,"未找到平台供应商数据");
+        }
+        $wsm=Db::name("warehouse_info")->where(["supplierNo"=>$zxinfo['gsyNo'],"wsm_type"=>2])->find();
+        if(empty($wsm)){
+            return error_show(1004,"未找到供应商仓库数据");
+        }
+        $sendtype =isset($this->post['sendtype']) && $this->post['sendtype'] !=="" ?trim($this->post['sendtype']):"";
+        if($sendtype==''){
+            return error_show(1004,"参数sendtype不能为空");
+        }
+        $good_num =isset($this->post['good_num']) && $this->post['good_num'] !=="" ?intval($this->post['good_num']):"";
+        if($good_num===''){
+            return error_show(1004,"参数good_num不能为空");
+        }
+        $goodtype =isset($this->post['goodtype']) && $this->post['goodtype'] !=="" ?intval($this->post['goodtype']):"";
+        if($goodtype===''){
+            return error_show(1004,"参数goodtype不能为空");
+        }
+        $remark =isset($this->post['remark']) && $this->post['remark'] !=="" ?trim($this->post['remark']):"";
+        if($sendtype!=2){
+            $addrlist = isset($this->post['addrlist']) && $this->post['addrlist'] !=="" ?$this->post['addrlist']:"";
+            if($addrlist=="" || empty($addrlist)){
+                return error_show(1004,"参数addrlist不能为空");
+            }
+        }
+        $apply_id =GetUserInfo($token);
+        if(empty($apply_id)||$apply_id['code']!=0){
+            return error_show(1002,"申请人数据不存在");
+        }
+        $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+        $ri= isset($apply_id["data"]['nickname']) ?  $apply_id["data"]['nickname'] : "";
+        Db::startTrans();
+        try {
+            $data=[
+                "customer_code"=>$customer_code,
+                "good_num"=>$good_num,
+                "apply_id"=>$rm,
+                "apply_name"=>$ri,
+                "wsend_num"=>$good_num,
+                "good_type"=>$goodtype,
+                "send_type"=>$sendtype,
+                "supplierNo"=>$supplierNo,
+                "remark"=>$remark,
+                "updatetime"=>date("Y-m-d H:i:s"),
+                'total_price'=>round($zxinfo['last_price']*$good_num,2),
+            ];
+            $datainfo = Db::name('sale')->where(["id"=>$zxNo])->save($data);
+            if($datainfo!=false){
+                $saleinfos=[
+                    "wsm_code"=>$wsm['wsm_code'],
+                    "num"=>$good_num,
+                    "sale_price"=>$zxinfo['last_price'],
+                    "total_price"=>round($zxinfo['last_price']*$good_num,2),
+                    "updatetime"=>date("Y-m-d H:i:s"),
+                ];
+                $info = Db::name("sale_info")->where(["orderCode"=>$saleinfo['orderCode']])->save($saleinfos);
+                if($info==false){
+                    Db::rollback();
+                    return error_show(1002,"咨询订单创建失败");
+                }
+                if($sendtype!=2){
+                    foreach ($addrlist 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']:'';
+                        }
+                       isset($value["id"])&&$value["id"]!=""? $temp['id']=$value['id']:"";
+                        $temp['contactor']=$value['contactor'];
+                        $temp['mobile'] = $value['mobile'];
+                        $temp['addr'] = $value['addr'];
+                        $temp['addr_code']=$addr;
+                        $temp['customer_code'] =$customer_code;
+                        $temp['receipt_quantity']=$value['receipt_quantity'];
+                        $temp['post_fee'] =0;
+                        $temp['is_del'] =$value['is_del'];
+                        $temp['updatetime'] =date("Y-m-d H:i:s");
+                        $temp['arrive_time']=$value['arrive_time'];
+                        $vmp = Db::name('order_addr')->save($temp);
+                        if(!$vmp){
+                            Db::rollback();
+                            return error_show(0,"咨询订单地址更新失败");
+                        }
+                    }
+
+                }
+                    Db::commit();
+                    return error_show(0,"咨询订单更新成功");
+            }
+            Db::rollback();
+            return error_show(1002,"咨询订单更新失败");
+        }catch(\Exception $e){
+            Db::rollback();
+            return error_show(1005,$e->getMessage());
+        }
+    }
 }

app/admin/route/app.php

@@ -250,6 +250,7 @@ Route::rule('reorderdel','admin/Reorder/delete');
 Route::rule('reorderexam','admin/Reorder/exam');
 
 Route::rule('salezxcreate','admin/Salezx/create');
+Route::rule('salezxedit','admin/Salezx/edit');
 
 Route::rule('saledifflist','admin/Sale/difflist');
 Route::rule('salediffcheck','admin/Sale/diffcheck');