Эх сурвалжийг харах

Merge branch 'dev_wf' of wugg/phpstock into version1.5

wufeng 2 жил өмнө
parent
commit
d383e962d8

+ 4 - 1
app/admin/controller/Activity.php

@@ -496,6 +496,7 @@ class Activity extends Base
         }
         Db::startTrans();
         try{
+            $isRejectAll = true;//是否全部驳回
             foreach ($good_list as $value){
                 $temp=[];
                 $temp["id"]=$value['id'];
@@ -507,9 +508,11 @@ class Activity extends Base
                     Db::rollback();
                     return error_show(1004,"商品数据更新失败");
                 }
+
+                if ($isRejectAll && ($value['status'] == 1)) $isRejectAll = false;//只要有一个商品通过,即不能全部驳回
             }
             $old_activity_status = $activity['status'];
-            $activity['status']=4;
+            $activity['status'] = $isRejectAll ? 8 : 4;//4审核通过,8审核未通过
             $activity['updatetime']=date("Y-m-d H:i:s");
             $act = Db::name("good_activity")->save($activity);
             if($act){