ad

app/admin/controller/Goodup.php

@@ -1709,7 +1709,7 @@ class Goodup extends Base
     }
 
     /**
-     * 已下线商品重新发起上线
+     * 已下线商品重新发起上线流程
      */
     public function againOnline(){
         $skuCode = isset($this->post['skuCode'])&&$this->post['skuCode']!==""?trim($this->post['skuCode']):"";
@@ -1725,12 +1725,12 @@ class Goodup extends Base
             return error_show(1004,"商品状态有误");
         }
         //判断平台商品编码是否重复
-        $rs = Db::name("good_platform")
-            ->field('id')
-            ->where(["plat_code" => $platform['plat_code'],"platform_code" => $platform['platform_code'], 'exam_status' => 6, "is_del" => 0])//exam_status==6已上线
-            ->where('id', '<>', $platform['id'])
-            ->find();
-        if (!empty($rs)) return error_show(1005, '该商品的平台商品编码已被使用');
+//        $rs = Db::name("good_platform")
+//            ->field('id')
+//            ->where(["plat_code" => $platform['plat_code'],"platform_code" => $platform['platform_code'], 'exam_status' => 6, "is_del" => 0])//exam_status==6已上线
+//            ->where('id', '<>', $platform['id'])
+//            ->find();
+//        if (!empty($rs)) return error_show(1005, '该商品的平台商品编码已被使用');
 
         $nake =Db::name("good_nake")->where(["spuCode"=>$platform['spuCode'],"is_del"=>0])->select()->toArray();
         $bifore=$platform['exam_status'];

app/admin/controller/Version.php

@@ -457,11 +457,10 @@ class Version extends BaseController
             }
         }
          if($orderinfo['order_type']==3){
-                                $good=Db::name("consult_bids")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
-
-                            }else{
-                                $good=Db::name("good")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
-                            }
+            $good=Db::name("consult_bids")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
+          }else{
+            $good=Db::name("good")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
+         }
         $outinfo['addr'] = $addrinfo['addr'];
         $outinfo['contactor'] = $addrinfo['contactor'];
         $outinfo['mobile'] = $addrinfo['mobile'];