add

app/admin/controller/Activity.php

@@ -655,6 +655,44 @@ class Activity extends Base
             b.cost_price,b.moq_num,b.sale_price,b.activity_price')->select()->toArray();
       return app_show(0,"获取成功",["act"=>$list,"good"=>$goodlist]);
     }
-
+	//新增库存
+    public function editStock(){
+    	$actCode=isset($this->post['actCode'])&&$this->post['actCode']!='' ? trim($this->post['actCode']):"";
+    	if($actCode==''){
+    		return error_show(1004,"参数 actCode 不能为空");
+    	}
+    	$skuCode=isset($this->post['skuCode'])&&$this->post['skuCode']!='' ? trim($this->post['skuCode']):"";
+    	if($skuCode==''){
+    		return error_show(1004,"参数 skuCode 不能为空");
+    	}
+    	$act_stock=isset($this->post['act_stock'])&&$this->post['act_stock']!='' ? intval($this->post['act_stock']):"";
+    	if($act_stock==''){
+    		return error_show(1004,"参数 act_stock 不能为空");
+    	}
+    	$act =Db::name("good_activity")->where(["activity_code"=>$actCode,"is_del"=>0])->findOrEmpty();
+    	if(empty($act)){
+    		return error_show(1005,"活动信息不存在");
+    	}
+    	if(!in_array($act['status'],[4,5,6]))return error_show(1005,"活动暂时不能修改");
+    	$goodinfo=Db::name("activity_info")->where(["activity_code"=>$actCode,"skuCode"=>$skuCode,"is_del"=>0])
+    	->findOrEmpty();
+    	if(empty($goodinfo)){
+    		return  error_show(1005,"活动商品信息不存在");
+    	}
+    	$good =  Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
+            ->where(['a.skuCode' =>$skuCode,"a.is_del"=>0,'a.exam_status'=>6])->findOrEmpty();
+		if(empty($good)){
+			return  error_show(1005,"商品信息不存在或已下架");
+		}
+		if($good['is_stock']==1){
+			$stock =Db::name("good_stock")->where(["spuCode"=>$good['spuCode'],"is_del"=>0])->sum('usable_stock');
+			if($act_stock+$goodinfo['activity_stock']> $stock){
+				return  error_show(1005,"商品库存不足");
+			}
+		}
+		$update =["activity_stock"=>$act_stock+$goodinfo['activity_stock'],"updatetime"=>date("Y-m-d H:i:s")];
+		$up=Db::name("activity_info")->where($goodinfo)->update($update);
+		return $up ? app_show(0,"活动库存增加成功"):error_show(1006,"活动库存增加失败");
+    }
 
 }

app/admin/route/app.php

@@ -397,6 +397,7 @@ Route::rule('activitylist','admin/Activity/list');
 Route::rule('activitylinst','admin/Activity/linst');
 Route::rule("zixunlist",'admin/Activity/zilist');
 Route::rule("actquery",'admin/Activity/query');
+Route::rule("actstock",'admin/Activity/editStock');
 
 Route::rule("platformcreate",'admin/Platform/create');
 Route::rule('platformlist','admin/Platform/list');

app/youzan/logic/Goodup.php

@@ -180,7 +180,7 @@ class Goodup
                         $value['id'] = $iso['id'];
                         $value['updatetime'] = date("Y-m-d H:i:s");
                     }
-                    $up = Db::name("good")->save($value);
+                    $up = Db::name("good")->strict(false)->save($value);
                     if (!$up) {
                         Db::rollback();
                         return error_show(1004, "提交失败");