Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/Consult.php

@@ -780,6 +780,16 @@ class Consult extends Base
                                             Db::rollback();
                                             return error_show(1006,"项目反馈失败");
                                         }
+
+                                        //修改状态，添加待办
+                                        $process = [
+                                            "order_code" => $projectinfo['projectNo'],//把项目编码放到这儿
+                                            //"order_id"=>0,//没有订单id，默认0
+                                            "order_status" => 2,//2表示'流程中'
+                                            "order_type" => 'PRO'//PRO表示'项目'
+                                        ];
+                                        ProcessOrder::AddProcess($this->post['token'], $process);
+
                                     }
                                 }
                             }
@@ -1021,6 +1031,16 @@ class Consult extends Base
                                     Db::rollback();
                                     return error_show(1006, "项目反馈失败");
                                 }
+
+                                //修改状态，添加待办
+                                $process = [
+                                    "order_code" => $projectinfo['projectNo'],//把项目编码放到这儿
+                                    //"order_id"=>0,//没有订单id，默认0
+                                    "order_status" => 2,//2表示'流程中'
+                                    "order_type" => 'PRO'//PRO表示'项目'
+                                ];
+                                ProcessOrder::AddProcess($this->post['token'], $process);
+
                             }
                         }
                     }

app/admin/controller/Goodup.php

@@ -108,6 +108,25 @@ class Goodup extends Base
               ->group("a.spuCode")->column('a.spuCode');
             $where[]=["spuCode","in",$sta];
         }
+        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $apply_id =GetUserInfo($token);
+        if(empty($apply_id)||$apply_id['code']!=0){
+            return error_show(102,"申请人数据不存在");
+        }
+        $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+        if($rm!=''){
+            $useinfo = Db::name("user_role")->where(['uid'=>$rm,"status"=>1,"is_del"=>0])->find();
+            if($useinfo==false){
+                return error_show(1002,"未找到用户角色权限");
+            }
+            $check = checkRole($useinfo['roleid'],115);
+            if($check){
+                $where[]=['createrid', "=" ,$rm];
+            }
+        }
 
         $count = Db::name('good_basic')->where($where)->count();
         $total = ceil($count / $size);
@@ -769,7 +788,7 @@ class Goodup extends Base
                             $lemp['nake_total'] =$value['nake_fee']+$value['delivery_fee']+$value['cert_fee']+$value['mark_fee']+$value['package_fee']+$value['other_fee'];
                         }
                         $lemp['is_del'] = isset($value['is_del'])?$value['is_del']:0;
-                        $lemp['createrid'] = isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+                        $lemp['creater_id'] = isset($user["data"]['id']) ?  $user["data"]['id'] : "";
                         $lemp['creater'] =isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
                         isset($value["id"])&&$value["id"]!=''?"": $lemp['addtime'] = date("Y-m-d H:i:s");
                         $lemp['updatetime'] =date("Y-m-d H:i:s");

app/admin/controller/Project.php

@@ -212,6 +212,16 @@ class Project extends Base
                         $proc =Db::name("project")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])->save
                         (["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
                         if($proc){
+
+                            //修改状态，添加待办
+                            $process = [
+                                "order_code" => $projectinfo['projectNo'],//把项目编码放到这儿
+                                //"order_id"=>0,//没有订单id，默认0
+                                "order_status" => 2,//2表示'流程中'
+                                "order_type" => 'PRO'//PRO表示'项目'
+                            ];
+                            ProcessOrder::AddProcess($this->post['token'], $process);
+
                             Db::commit();
                             return app_show(0,"添加成功");
                         }
@@ -559,6 +569,16 @@ class Project extends Base
                     $info['updatetime']=date("Y-m-d H:i:s");
                     $cr =Db::name("project")->save($info);
                     if($cr){
+
+                        //修改状态，添加待办
+                        $process = [
+                            "order_code" => $projectNo,//把项目编码放到这儿
+                            //"order_id"=>0,//没有订单id，默认0
+                            "order_status" => 2,//2表示'流程中'
+                            "order_type" => 'PRO'//PRO表示'项目'
+                        ];
+                        ProcessOrder::AddProcess($this->post['token'], $process);
+
                         Db::commit();
                         return app_show(0,"方案制作成功",["planNo"=>$planNo]);
                     }
@@ -707,6 +727,15 @@ class Project extends Base
                             if(!$proc){
                                 Db::rollback();
                                 return error_show(1004,"反馈数据选择失败");
+                            }else{
+                                //修改状态，添加待办
+                                $process = [
+                                    "order_code" => $value['projectNo'],//把项目编码放到这儿
+                                    //"order_id"=>0,//没有订单id，默认0
+                                    "order_status" => 2,//2表示'流程中'
+                                    "order_type" => 'PRO'//PRO表示'项目'
+                                ];
+                                ProcessOrder::AddProcess($this->post['token'], $process);
                             }
                         }
                     }else{
@@ -790,6 +819,16 @@ class Project extends Base
         $info['updatetime']=date("Y-m-d H:i:s");
         $up =Db::name("project")->save($info);
         if($up){
+
+            //修改状态，添加待办
+            $process = [
+                "order_code" => $projectNo,//把项目编码放到这儿
+                //"order_id"=>0,//没有订单id，默认0
+                "order_status" => 2,//2表示'流程中'
+                "order_type" => 'PRO'//PRO表示'项目'
+            ];
+            ProcessOrder::AddProcess($this->post['token'], $process);
+
             return app_show(0,"利润率修改成功");
         }else{
             return error_show(1004,"利润率修改失败");

app/admin/controller/Sale.php

@@ -1017,6 +1017,16 @@ class Sale extends Base
                 Db::rollback();
                 return error_show(1002, "项目订单生成失败");
             }
+
+            //修改状态，添加待办
+            $process = [
+                "order_code" => $project['projectNo'],//把项目编码放到这儿
+                //"order_id"=>0,//没有订单id，默认0
+                "order_status" => 2,//2表示'流程中'
+                "order_type" => 'PRO'//PRO表示'项目'
+            ];
+            ProcessOrder::AddProcess($this->post['token'], $process);
+
             Db::commit();
             return app_show(0, "咨询订单生成成功");
         }catch (\Exception $e){

app/admin/controller/Version.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -310,6 +311,15 @@ class Version extends BaseController
                             if(!$proc){
                                 Db::rollback();
                                 return error_show(1004,"反馈数据选择失败");
+                            }else{
+                                //修改状态，添加待办
+                                $process = [
+                                    "order_code" => $value['projectNo'],//把项目编码放到这儿
+                                    //"order_id"=>0,//没有订单id，默认0
+                                    "order_status" => 2,//2表示'流程中'
+                                    "order_type" => 'PRO'//PRO表示'项目'
+                                ];
+                                ProcessOrder::AddProcess($this->post['token'], $process);
                             }
                         }
                     }else{
@@ -367,6 +377,16 @@ class Version extends BaseController
                 }
                 $pro = Db::name("project")->where(["projectNo" => $project, "status" => 4])->save(["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
                 if ($pro) {
+
+                    //修改状态，添加待办
+                    $process = [
+                        "order_code" => $project,//把项目编码放到这儿
+                        //"order_id"=>0,//没有订单id，默认0
+                        "order_status" => 2,//2表示'流程中'
+                        "order_type" => 'PRO'//PRO表示'项目'
+                    ];
+                    ProcessOrder::AddProcess($this->post['token'], $process);
+
                     Db::commit();
                     return app_show(0, "方案数据修改成功");
                 }

app/common.php

@@ -752,4 +752,16 @@ function GoodPrice($data,$cost_rate=0){
     $rate = ($data['open_fee']/$data['num']+ $data['cost_fee']+$data['packing_fee']+$data["mark_fee"]+$data["cert_fee"]+$data['nake_fee'])/(1-$cost_rate
         );
     return $rate;
+}
+
+function checkRole($roleid,$menu){
+    $roleinfo = Db::name("role_action")->where([['role_id',"=",$roleid],["status","=",1]])->find();
+    if($roleinfo['private_data']!=""){
+
+        $private = explode(",",$roleinfo['private_data']);
+        if(in_array($menu,$private)){
+            return true;
+        }
+    }
+    return false;
 }