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

app/admin/controller/Consult.php

@@ -1180,68 +1180,69 @@ class Consult extends Base
                         return error_show(1006,"未找到项目信息");
                     }
                     $feed = Db::name("project_feedback")->where(["pgNo"=>$zxinfo["pgNo"],"projectNo"=>$zx['projectNo'],"spuCode"=>$bidinfo['spuCode'],"is_del"=>0])->find();
-                  if($feed==false){
-                      Db::rollback();
-                      return error_show(1006,"未找到项目反馈信息");
+                  if($feed!=false) {
+                      $feed['good_name']=$pname;
+                      $feed['good_type']=$projectinfo['good_type'];
+                      $feed['cat_id']=$cat_id;
+                      $feed['sale_price']=$saleprice;
+                      $feed['origin_price']=$total_fee;
+                      $feed['updatetime']=date("Y-m-d H:i:s");
+
+                      $temp['updatetime']=date("Y-m-d H:i:s");
+                      $nu=Db::name("project_feedback")->save($feed);
+                      if ($nu == false) {
+                          Db::rollback();
+                          return error_show(1006 , "项目反馈失败");
+                      } else {
+                          $old_projectinfo_status=$projectinfo['status'];
+                          $projectinfo['status']=2;
+                          $projectinfo['updatetime']=date("Y-m-d H:i:s");
+                          $up=Db::name("project_info")->save($projectinfo);
+                          if ($up) {
+
+                              //修改状态，添加待办，只记录动作
+                              ActionLog::logAdd($this->post['token'] , [
+                                  "order_code"=>$projectinfo['pgNo'] ,//编码
+                                  "status"=>$old_projectinfo_status ,//这里的status是之前的值
+                                  "action_remark"=>'' ,//备注
+                                  "action_type"=>"status"//新建create，编辑edit，更改状态status
+                              ] , "PRI" , 2 , $projectinfo
+                              );
+
+                              $count=Db::name("project_info")->where(["projectNo"=>$projectinfo['projectNo'] , "status"=>1])->count();
+
+                              if ($count == 0) {
+                                  //先查询是否存在status==1的项目，有的话再更新，否则跳过
+                                  $project_id=Db::name("project")->where(["projectNo"=>$projectinfo['projectNo'] , "status"=>1])->value('id' , 0);
+                                  if ($project_id) {
+                                      $proc=Db::name("project")->where(["id"=>$project_id])->update(["status"=>2 , "updatetime"=>date("Y-m-d H:i:s")]);
+                                      if ($proc == false) {
+                                          Db::rollback();
+                                          return error_show(1006 , "项目反馈失败");
+                                      } else {
+                                          //修改状态，添加待办
+                                          ActionLog::logAdd($this->post['token'] , [
+                                              "order_code"=>$projectinfo['projectNo'] ,//项目编码
+                                              "status"=>1 ,//这里的status是之前的值
+                                              "action_remark"=>'' ,//备注
+                                              "action_type"=>"status"//新建create，编辑edit，更改状态status
+                                          ] , "PRO" , 2 , $this->post
+                                          );
+
+                                          ProcessOrder::AddProcess($this->post['token'] , [
+                                              "order_type"=>'PRO' ,
+                                              "order_code"=>$projectinfo['projectNo'] ,
+                                              "order_id"=>$project_id ,
+                                              "order_status"=>2 , "before_status"=>1
+                                          ]
+                                          );
+                                      }
+
+                                  }
+                              }
+                          }
+                      }
                   }
-                $feed['good_name']=$pname;
-                $feed['good_type']=$projectinfo['good_type'];
-                $feed['cat_id']=$cat_id;
-                $feed['sale_price']=$saleprice;
-                $feed['origin_price']=$total_fee;
-                $feed['updatetime']=date("Y-m-d H:i:s");
-
-                $temp['updatetime']=date("Y-m-d H:i:s");
-                $nu = Db::name("project_feedback")->save($feed);
-                if($nu==false){
-                    Db::rollback();
-                    return error_show(1006,"项目反馈失败");
-                }else{
-                    $old_projectinfo_status = $projectinfo['status'];
-                    $projectinfo['status']=2;
-                    $projectinfo['updatetime']=date("Y-m-d H:i:s");
-                    $up = Db::name("project_info")->save($projectinfo);
-                    if($up){
-
-                        //修改状态，添加待办，只记录动作
-                        ActionLog::logAdd($this->post['token'], [
-                            "order_code" => $projectinfo['pgNo'],//编码
-                            "status" => $old_projectinfo_status,//这里的status是之前的值
-                            "action_remark" => '',//备注
-                            "action_type" => "status"//新建create，编辑edit，更改状态status
-                        ], "PRI", 2, $projectinfo);
-
-                        $count = Db::name("project_info")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])->count();
-
-                        if ($count == 0) {
-                            //先查询是否存在status==1的项目，有的话再更新，否则跳过
-                            $project_id = Db::name("project")->where(["projectNo" => $projectinfo['projectNo'], "status" => 1])->value('id', 0);
-                            if ($project_id) {
-                                $proc = Db::name("project")->where(["id" => $project_id])->update(["status" => 2, "updatetime" => date("Y-m-d H:i:s")]);
-                                if ($proc == false) {
-                                    Db::rollback();
-                                    return error_show(1006, "项目反馈失败");
-                                }else{
-                                    //修改状态，添加待办
-                                    ActionLog::logAdd($this->post['token'], [
-                                        "order_code" => $projectinfo['projectNo'],//项目编码
-                                        "status" => 1,//这里的status是之前的值
-                                        "action_remark" => '',//备注
-                                        "action_type" => "status"//新建create，编辑edit，更改状态status
-                                    ], "PRO", 2, $this->post);
-
-                                    ProcessOrder::AddProcess($this->post['token'], [
-                                        "order_type" => 'PRO',
-                                        "order_code" => $projectinfo['projectNo'],
-                                        "order_id" => $project_id,
-                                        "order_status" => 2,"before_status"=>1
-                                    ]);
-                                }
-
-                            }
-                        }
-                    }
-                }
             }
                 Db::commit();
                 return app_show(0,"编辑成功");

app/admin/controller/Purch.php

@@ -123,7 +123,7 @@ class Purch extends Base
 //            $where[]=["po.platform_id","in",$role['platform']];
 //        }
         $count=Db::name("purchease_order")->alias('po')->leftJoin('order_num on','on.cgdNo=po.cgdNo')->where($where)
-            ->whereOr([['po.order_type', '<>', 1],['po.order_source', '=', 0]])->count();
+            ->where(function($query) use ($where){$query->whereOr([['po.order_type', '<>', 1],['po.order_source', '=', 0]]);})->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name("purchease_order")
@@ -132,13 +132,10 @@ class Purch extends Base
             ->leftJoin("depart_user u", "u.uid=po.cgder_id AND u.is_del=0")
             ->field('po.*,on.orderCode,u.itemid')
             ->where($where)
-            ->whereOr([['po.order_type', '<>', 1],['po.order_source', '=', 0]])
+            ->where(function($query) use ($where){$query->whereOr([['po.order_type', '<>', 1],['po.order_source', '=', 0]]);})
             ->page($page,$size)
             ->order("po.addtime desc")
             ->cursor();
-//        $all_orderCodes = Db::name('order_num')
-//            ->whereIn('cgdNo',array_column($list,'cgdNo'))
-//            ->column('orderCode','cgdNo');
         $data=[];
         foreach ($list as $value){
             $value['wsm_name']="";