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

app/admin/controller/Reorder.php

@@ -82,7 +82,7 @@ class Reorder extends \app\BaseController
                 $return = Db::name("sale")->save($order);
                 if($return){
                     Db::commit();
-                    return app_show(0,"退货单新建成功");
+                    return app_show(0,"退货单新建成功",["returnCode"=>$returnCode]);
                 }
             }
             Db::rollback();

app/admin/controller/Sale.php

@@ -71,6 +71,9 @@ class Sale extends BaseController
         if($arrtime==""){
             return error_show(1004,"参数arrtime不能为空");
         }
+        $paytime =isset($this->post['paytime'])&&$this->post['paytime']!=""? $this->post['paytime']:"";
+        $workNo =isset($this->post['workNo'])&&$this->post['workNo']!=""? trim($this->post['workNo']):"";
+        $poNo =isset($this->post['poNo'])&&$this->post['poNo']!=""? trim($this->post['poNo']):"";
         $ct = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
             ->where(['a.skuCode' => $good_code])->find();
             if ($ct == false) {
@@ -153,10 +156,13 @@ class Sale extends BaseController
                 "is_activity"=>$is_activity===""?0:$is_activity,
                 "proof_id"=>$proofid,
                 "order_type"=>$order_type,
+                "poNo"=>$poNo,
+                "workNo"=>$workNo,
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s"),
                 'total_price'=>round($goodinfo['sale_price']*$good_num,2),
             ];
+           $paytime==""?"": $data['paytime'] = $paytime;
             $datainfo = Db::name('sale')->insert($data,true);
             if($datainfo>0){
                 if($is_stock==0){
@@ -2662,4 +2668,28 @@ class Sale extends BaseController
 
         }
 
+    public function addother(){
+        $orderCode =isset($this->post['orderCode']) && $this->post['orderCode']!=""?trim($this->post['orderCode']):"";
+        if($orderCode==""){
+            return error_show(1004,"参数orderCode不能为空");
+        }
+        $order =Db::name("sale")->where(["orderCode"=>$orderCode,"is_del"=>0])->find();
+        if($order==false){
+            return error_show(1004,"未找到订单数据");
+        }
+        $paytime =isset($this->post['paytime'])&&$this->post['paytime']!=""? $this->post['paytime']:"";
+        $workNo =isset($this->post['workNo'])&&$this->post['workNo']!=""? trim($this->post['workNo']):"";
+        $poNo =isset($this->post['poNo'])&&$this->post['poNo']!=""? trim($this->post['poNo']):"";
+        $paytime==""?"":$order['paytime']=$paytime;
+        $order['workNo']=$workNo;
+        $order['poNo']=$poNo;
+        $order['updatetime']=date("Y-m-d H:i:s");
+        $sa=Db::name("sale")->save($order);
+        if($sa){
+            return app_show(0,"更新成功");
+        }else{
+            return error_show(1004,"更新失败");
+        }
+
+    }
 }

app/admin/controller/User.php

@@ -331,71 +331,74 @@ class User extends BaseController
                return error_show(1002,"未找到部门信息");
            }
         }
-        $companyArr = isset($this->post['companyArr'])&&!empty($this->post['companyArr']) ?
-            $this->post['companyArr']:"";
-        if($companyArr==""){
-            return error_show(1004,"参数companyArr不能为空");
-        }
-        $compArr=[];
-        foreach ($companyArr as $value){
-            $tmp=[];
-            if(!isset($value['id'])||$value['id']==''){
-                return error_show(1004,"参数业务公司id不能为空");
-            }
-            $tmp['userid']=$userid;
-            $tmp['businessid']=$value['businessid'];
-            $tmp['is_main']=isset($value['is_main'])?$value['is_main']:0;
-            $tmp['is_del']=0;
-            $tmp['addtime']=date("Y-m-d H:i:s");
-            $tmp['updatetime']=date("Y-m-d H:i:s");
-            $compArr[]=$tmp;
-        }
-        $platform = isset($this->post['platform'])&&!empty($this->post['platform']) ?
-            $this->post['platform']:"";
-        if($platform==""){
-            return error_show(1004,"参数platform不能为空");
-        }
-        $plta =Db::name("platform")->where(["id"=>$platform,"is_del"=>0])->select()->toArray();
-        if(empty($plta)){
-            return error_show(1004,"未找到可用平台");
-        }
-        $userplat =Db::name("user_platform")->where(["uid"=>$userid,"is_del"=>0])->find();
+//        $companyArr = isset($this->post['companyArr'])&&!empty($this->post['companyArr']) ?
+//            $this->post['companyArr']:"";
+//        if($companyArr==""){
+//            return error_show(1004,"参数companyArr不能为空");
+//        }
+//        $compArr=[];
+//        foreach ($companyArr as $value){
+//            $tmp=[];
+//            if(!isset($value['id'])||$value['id']==''){
+//                return error_show(1004,"参数业务公司id不能为空");
+//            }
+//            $tmp['userid']=$userid;
+//            $tmp['businessid']=$value['businessid'];
+//            $tmp['is_main']=isset($value['is_main'])?$value['is_main']:0;
+//            $tmp['is_del']=0;
+//            $tmp['addtime']=date("Y-m-d H:i:s");
+//            $tmp['updatetime']=date("Y-m-d H:i:s");
+//            $compArr[]=$tmp;
+//        }
+//        $platform = isset($this->post['platform'])&&!empty($this->post['platform']) ?
+//            $this->post['platform']:"";
+//        if($platform==""){
+//            return error_show(1004,"参数platform不能为空");
+//        }
+//        $plta =Db::name("platform")->where(["id"=>$platform,"is_del"=>0])->select()->toArray();
+//        if(empty($plta)){
+//            return error_show(1004,"未找到可用平台");
+//        }
+//        $userplat =Db::name("user_platform")->where(["uid"=>$userid,"is_del"=>0])->find();
 
         $isall = isset($this->post['is_all'])&&$this->post['is_all']!==""?intval($this->post['is_all']):"0";
 
         Db::startTrans();
         try{
-            $sc=Db::name("user_business")->where(["uid"=>$userid,"is_del"=>0])->select()->toArray();
-            if(!empty($sc)){
-                $del= Db::name("user_business")->where(["uid"=>$userid,"is_del"=>0])->save(["is_del"=>1,
-                    "updatetime"=>date("Y-m-d H:i:s")]);
-                if($del==false){
-                    Db::rollback();
-                    return error_show(1005,'业务公司添加失败');
-                }
-            }
-            $in = Db::name("user_business")->insertAll($compArr);
-            if($in==0){
-                Db::rollback();
-                return error_show(1005,'业务公司添加失败');
-            }
-            if($userplat==false){
-                $userplat=[
-                    "uid"=>$userid,
-                    "platform"=>implode(",",$platform),
-                    "is_del"=>0,
-                    "addtime"=>date("Y-m-d H:i:s"),
-                    "updatetime"=>date("Y-m-d H:i:s")
-                ];
-            }else{
-             $userplat['platform']= implode(",",$platform);
-             $userplat['updatetime']= date("Y-m-d H:i:s");
-            }
-            $patup =Db::name("user_platform")->save($userplat);
-            if($patup==false){
-                Db::rollback();
-                return error_show(1005,'业务平台添加失败');
-            }
+//            $sc=Db::name("user_business")->where(["uid"=>$userid,"is_del"=>0])->select()->toArray();
+//            if(!empty($sc)){
+//                $del= Db::name("user_business")->where(["uid"=>$userid,"is_del"=>0])->save(["is_del"=>1,
+//                    "updatetime"=>date("Y-m-d H:i:s")]);
+//                if($del==false){
+//                    Db::rollback();
+//                    return error_show(1005,'业务公司添加失败');
+//                }
+//            }
+//            if(!empty($compArr)){
+//                $in = Db::name("user_business")->insertAll($compArr);
+//                if($in==0){
+//                    Db::rollback();
+//                    return error_show(1005,'业务公司添加失败');
+//                }
+//            }
+//
+//            if($userplat==false){
+//                $userplat=[
+//                    "uid"=>$userid,
+//                    "platform"=>implode(",",$platform),
+//                    "is_del"=>0,
+//                    "addtime"=>date("Y-m-d H:i:s"),
+//                    "updatetime"=>date("Y-m-d H:i:s")
+//                ];
+//            }else{
+//             $userplat['platform']= implode(",",$platform);
+//             $userplat['updatetime']= date("Y-m-d H:i:s");
+//            }
+//            $patup =Db::name("user_platform")->save($userplat);
+//            if($patup==false){
+//                Db::rollback();
+//                return error_show(1005,'业务平台添加失败');
+//            }
             $userrole = Db::name("user_role")->where(["uid"=>$userid,"is_del"=>0])->find();
             if(empty($userrole)){
                 $roledata =[

app/admin/route/app.php

@@ -249,6 +249,7 @@ Route::rule('afterfeed','admin/After/postfeed');
 Route::rule('afterpost','admin/After/addpost');
 Route::rule('aftergys','admin/After/GysFeed');
 Route::rule('afterwsm','admin/After/GetWsm');
+//Route::rule('aftersetwsm','admin/After/setWsm');
 
 Route::rule('processolist','admin/Proorder/list');
 Route::rule('processowaitlist','admin/Proorder/waitlist');
@@ -282,6 +283,7 @@ Route::rule('salediffinfo','admin/Sale/diffinfo');
 Route::rule('salediffstatus','admin/Sale/diffstatus');
 Route::rule('saleoutadd','admin/Sale/outadd');
 Route::rule('saleoutsend','admin/Sale/outSend');
+Route::rule('saleaddother','admin/Sale/addother');
 
 Route::rule('msglist','admin/Log/msglist');
 Route::rule('msginfo','admin/Log/update');