ソースを参照

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

wugg 3 年 前
コミット
45aaa03f62
1 ファイル変更7 行追加2 行削除
  1. 7 2
      app/admin/controller/After.php

+ 7 - 2
app/admin/controller/After.php

@@ -200,10 +200,15 @@ class After extends \app\BaseController
         }
         $orderinfo = Db::name("sale")->where(["orderCode"=>$info["orderCode"]])->find();
         $info['origin_price']=$orderinfo['origin_price'];
+        $info['order_type']=$orderinfo['order_type'];
         $info['sale_price']=$orderinfo['sale_price'];
         $info['total_price']=sprintf("%1\$.2f",$orderinfo['sale_price']*$info['error_num']);
-        $goon = Db::name('good')->alias('b')->join("good_type a", "a.good_code=b.good_code", "left")
-            ->where(['a.type_code' => $info['good_code']])->find();
+        if($orderinfo['order_type']==3|| $orderinfo['order_type']==4){
+            $goon = Db::name("good_zixun")->where(["spuCode"=>$orderinfo['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' => $orderinfo['skuCode']])->find();
+        }
         if (empty($goon)) {
             return error_show(1003, "未找到商品数据");
         }