Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Goodup.php

@@ -1013,9 +1013,15 @@ class Goodup extends Base
         Db::startTrans();
         try {
             if($data['status']==3 && $status==1){
-                $online =  Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->find();
+            	        //区分是否是对接平台
+		        $platform_info=Db::name('platform')
+		            ->field('id,platform_type')
+		            ->where(['is_del'=>0,'platform_type'=>1])
+		            ->column("id");
+
+                $online =  Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->whereNotIn("platform_code",$platform_info)->find();
                 if($online) {
-                    $onl= Db::name("good_platform")->where(["spuCode" => $supcode, "is_del" => 0])->save(["exam_status" => 2, "updatetime" => date("Y-m-d H:i:s")]);
+                    $onl= Db::name("good_platform")->where(["spuCode" => $supcode, "is_del" => 0])->whereNotIn("platform_code",$platform_info)->save(["exam_status" => 2, "updatetime" => date("Y-m-d H:i:s")]);
                     if ($onl == false) {
                         Db::rollback();
                         return error_show(1004, "审核失败");