wugg há 2 anos atrás
pai
commit
5bc93571d6
2 ficheiros alterados com 9 adições e 16 exclusões
  1. 0 9
      app/admin/controller/Project.php
  2. 9 7
      app/admin/controller/Sale.php

+ 0 - 9
app/admin/controller/Project.php

@@ -132,15 +132,6 @@ class Project extends Base
                         ], "PRO", 1, $this->post);
                         $process = ["order_code" => $projectNo, "order_id" => Db::name("project")->getLastInsID(), "order_status" =>1, "order_type" =>"PRO"];
                         ProcessOrder::AddProcess($this->post['token'], $process);
-                        //修改状态,添加待办,只记录动作
-                        ActionLog::logAdd($this->post['token'], [
-                            "order_code" => $projectNo,//编码,这里是project的编码
-                            "status" => 0,//这里的status是之前的值
-                            "action_remark" => '',//备注
-                            "action_type" => "create"//新建create,编辑edit,更改状态status
-                        ], "PRT", 0, $this->post);
-                        $process = ["order_code" => $projectNo, "order_id" => Db::name("project")->getLastInsID(), "order_status" =>0, "order_type" =>"PRT"];
-                        ProcessOrder::AddProcess($this->post['token'], $process);
                         Db::commit();
                         return app_show(0,"项目新建成功",['projectNo'=>$projectNo]);
                 }

+ 9 - 7
app/admin/controller/Sale.php

@@ -1175,12 +1175,6 @@ class Sale extends Base
                     Db::rollback();
                     return error_show(1002, "项目订单生成失败");
                 }
-                ActionLog::logAdd($this->post['token'], [
-                    "order_code" => $feedback['id'],//编码
-                    "status" => $old_fk_status,//这里的status是之前的值
-                    "action_remark" => '',//备注
-                    "action_type" => "edit"//新建create,编辑edit,更改状态status
-                ], "FKD", 2, $feedback);
             }
             $old_plan_status = $plan['status'];
             $plan['status']=2;
@@ -1221,7 +1215,15 @@ class Sale extends Base
                     "order_status" => 6
                 ]);
             }
-
+            //修改状态,添加待办,只记录动作
+            ActionLog::logAdd($this->post['token'], [
+                "order_code" => $project['projectNo'],//编码,这里是project的编码
+                "status" => 1,//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "create"//新建create,编辑edit,更改状态status
+            ], "PRT", 2, $this->post);
+            $process = ["order_code" => $project['projectNo'], "order_id" => $project['id'], "order_status" =>2, "order_type" =>"PRT"];
+            ProcessOrder::AddProcess($this->post['token'], $process);
             Db::commit();
             return app_show(0, "咨询订单生成成功");
         }catch (\Exception $e){