Browse Source

区分有赞平台

wufeng 2 years ago
parent
commit
91dfcfc352
2 changed files with 6 additions and 4 deletions
  1. 2 2
      app/admin/controller/Activity.php
  2. 4 2
      app/admin/controller/Sale.php

+ 2 - 2
app/admin/controller/Activity.php

@@ -321,7 +321,7 @@ class Activity extends Base
                     }
                     foreach ($good_list as $value){
                         $lemp = [];
-                        if ($platform['platform_type'] == 1) $good = Db::name('good')->alias("a")->leftJoin("platform_youzan b", "a.spuCode=b.spuCode")->where(["skuCode" => $value['skuCode'], "a.is_del" => 0])->findOrEmpty(); //有赞使用
+                        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();
 
                         $lemp['skuCode']=$value['skuCode'];
@@ -544,7 +544,7 @@ class Activity extends Base
         }
         $activity = Db::name("good_activity")
             ->alias('ga')
-            ->field('ga.*,p.platform_name')
+            ->field('ga.*,p.platform_name,p.platform_type')
             ->leftJoin('platform p', 'p.id=ga.platform_code AND p.is_del=0')
             ->where(["ga.activity_code" => $activity_code, "ga.is_del" => 0])
             ->find();

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

@@ -2421,8 +2421,10 @@ class Sale extends Base
         if ($einfo['order_type'] == 3) {
             $goon = Db::name("good_zixun")->where(["spuCode" => $einfo['good_code'], "is_del" => 0])->find();
         } else {
-            $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
-                ->where(['a.skuCode' => $einfo['skuCode']])->find();
+            $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();
         }
         if ($goon == false) {
             return error_show(1003, "未找到商品数据");