Browse Source

改回去

wufeng 2 years ago
parent
commit
13d19a68b1
2 changed files with 2 additions and 8 deletions
  1. 1 4
      app/admin/controller/Activity.php
  2. 1 4
      app/admin/controller/Sale.php

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

@@ -238,8 +238,6 @@ class Activity extends Base
         if($platform_code==""){
             return error_show(1004,"参数platform_code不能为空");
         }
-        $platform = Db::name('platform')->where('id',$platform_code)->findOrEmpty();
-        if(empty($platform)) return error_show(1004,'改平台不存在');
 
         $company_id = isset($this->post['company_id'])&&$this->post['company_id']!="" ? trim($this->post['company_id']):"";
         if($company_id==""){
@@ -321,8 +319,7 @@ class Activity extends Base
                     }
                     foreach ($good_list as $value){
                         $lemp = [];
-                        if ($platform['platform_type'] == 1) $good = Db::name('good_basic')->alias("a")->leftJoin("platform_youzan b", "a.spuCode=b.spuCode")->field('good_name,spuCode')->where(["skuCode" => $value['skuCode'], "a.is_del" => 0])->findOrEmpty(); //有赞使用
-                        else  $good = Db::name('good')->alias("a")->leftJoin("good_platform b", "a.spuCode=b.spuCode")->where(["skuCode" => $value['skuCode'], "a.is_del" => 0])->findOrEmpty();
+                        $good = Db::name('good')->alias("a")->leftJoin("good_platform b", "a.spuCode=b.spuCode")->where(["skuCode" => $value['skuCode'], "a.is_del" => 0])->findOrEmpty();
 
                         $lemp['skuCode']=$value['skuCode'];
                         $lemp['good_name']=isset($good['good_name']) ?$good['good_name']:"" ;

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

@@ -2421,10 +2421,7 @@ class Sale extends Base
         if ($einfo['order_type'] == 3) {
             $goon = Db::name("good_zixun")->where(["spuCode" => $einfo['good_code'], "is_del" => 0])->find();
         } else {
-            $platform =  $platform = Db::name('platform')->field('id,platform_type')->where('id',$einfo['platform_id'])->findOrEmpty();
-            //有赞商品
-            if($platform['platform_type']==1) $goon = Db::name('platform_youzan')->alias('a')->join('good_basic b', 'b.spuCode=a.spuCode', 'left')->where(['a.skuCode' => $einfo['skuCode']])->find();
-            else $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')->where(['a.skuCode' => $einfo['skuCode']])->find();
+           $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')->where(['a.skuCode' => $einfo['skuCode']])->find();
         }
         if ($goon == false) {
             return error_show(1003, "未找到商品数据");