ad

app/txx/controller/Activity.php

@@ -85,6 +85,7 @@ class Activity extends Base{
                  $temp=[
 					'actCode'=>$param['actCode'],
 					'yz_good_code'=>$v['skuCode'],
+					'goodName'=>$yzGood[$v['skuCode']]['title']??'',
 					'stock_num'=>$v['stock_num'],
 					"awards_type"=>$v['awards_type'],
 					'used_num'=>0,
@@ -160,15 +161,21 @@ class Activity extends Base{
             $this->error("信息有误");
         }
         if(!in_array($info->status,[4,5]))throw new \Exception("状态有误");
-        $info->status=1;
+
         try{
            if($info->promocode_id!==0){
-            $promocode= \app\youzan\model\YzActivityPromoCode::findOrEmpty($info->promocode_id);
-            if($promocode->isEmpty())throw new \Exception('优惠券信息有误');
-            $promocode->save(['status'=>0]);
+            $promocode= \app\youzan\model\YzActivityPromoCode::where(["is_del"=>0,"id"=>$info->promocode_id])->findOrEmpty();
+            if($promocode->isEmpty()){
+                 $info->promocode_id=0;
+                 $info->status=1;
+            }else {
+                $promocode->save(['status'=>0]);
+                $info->remark="重试生成券码";
+            }
 
         }else{
             $info->promocode_id=0;
+            $info->status=1;
         }
         $save= $info->save();
         if(!$save)throw new \Exception('重置失败');
@@ -189,7 +196,7 @@ class Activity extends Base{
             $save= $info->save();
             if(!$save)throw new \Exception('删除失败');
             if($info->promocode_id!==0){
-                $promocode= \app\youzan\model\YzActivityPromoCode::findOrEmpty($info->promocode_id);
+                $promocode= \app\youzan\model\YzActivityPromoCode::where(['is_del'=>0,'id'=>$info->promocode_id])->findOrEmpty();
                 if($promocode->isEmpty())throw new \Exception('优惠券信息有误');
                 $promocode->save(['is_del'=>1]);
             }