活动部分接口加节点

app/admin/controller/Activity.php

@@ -3,6 +3,8 @@
 namespace app\admin\controller;
 
 use app\admin\common\Ocr;
+use app\admin\model\ActionLog;
+use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -195,6 +197,7 @@ class Activity extends Base
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
     }
 
+    //创建活动
     public function create(){
         $activity_name = isset($this->post['activity_name'])&&$this->post['activity_name']!="" ? trim($this->post['activity_name']):"";
         if($activity_name==""){
@@ -259,8 +262,8 @@ class Activity extends Base
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s")
             ];
-            $inset = Db::name("good_activity")->insert($data);
-            if($inset){
+            $inset = Db::name("good_activity")->insertGetId($data);
+            if($inset>0){
                 if($good_list!=""&&!empty($good_list)){
                     $temp=[];
                     foreach ($good_list as $value){
@@ -288,7 +291,11 @@ class Activity extends Base
                                 ->where(['spuCode' => $good['spuCode'], 'is_del' => 0])
                                 ->sum('usable_stock');
 
-                            if ($value['activity_stock'] > $usable_stock) throw new \Exception($lemp['good_name'] . '的库存只有' . $usable_stock);
+                            if ($value['activity_stock'] > $usable_stock) {
+                                Db::rollback();
+//                                throw new \Exception($lemp['good_name'] . '的库存只有' . $usable_stock);
+                                return app_show(1005,'库存不足',[$lemp['good_name']. '的库存只有' . $usable_stock]);
+                            }
                         }
 
                     }
@@ -298,6 +305,12 @@ class Activity extends Base
                         return error_show(1005,"新建失败");
                     }
                 }
+
+                $stn = ["order_code"=>$activity_code,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$stn,"HD",$data['status'],$data);
+                $process=["order_code"=>$activity_code,"order_id"=>$inset,"order_status"=>$data['status'],"order_type"=>'HD',"before_status"=>0];
+                ProcessOrder::AddProcess($this->post['token'],$process);
+
                 Db::commit();
                 return app_show(0,"新建成功");
             }
@@ -455,6 +468,7 @@ class Activity extends Base
         return  app_show(0,"获取成功",$activity);
     }
 
+    //修改活动状态
     public function  actstatus(){
         $activity_code= isset($this->post['activity_code'])&&$this->post['activity_code']!=="" ?trim($this->post['activity_code']):"";
         if($activity_code==""){
@@ -472,11 +486,18 @@ class Activity extends Base
         if($remark=="" &&$status==8){
             return error_show(1004,"参数remark不能为空");
         }
+        $old_status = $activity['status'];
         $activity['status']=$status;
         $activity['remark']=$remark;
         $activity['updatetime']=date("Y-m-d H:i:s");
         $up = Db::name("good_activity")->save($activity);
         if($up){
+
+            $stn = ["order_code"=>$activity_code,"status"=>$old_status,"action_remark"=>'',"action_type"=>"status"];
+            ActionLog::logAdd($this->post['token'],$stn,"HD",$activity['status'],$activity);
+            $process=["order_code"=>$activity_code,"order_id"=>$activity['id'],"order_status"=>$activity['status'],"order_type"=>'HD',"before_status"=>$old_status];
+            ProcessOrder::AddProcess($this->post['token'],$process);
+
             return  app_show(0,"修改成功");
         }else{
             return  error_show(1004,"修改失败");