Преглед изворни кода

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

wugg пре 3 година
родитељ
комит
e446569b38
1 измењених фајлова са 10 додато и 2 уклоњено
  1. 10 2
      app/admin/controller/Orderback.php

+ 10 - 2
app/admin/controller/Orderback.php

@@ -108,10 +108,18 @@ class Orderback extends \app\BaseController
       $orderinfo = Db::name("sale")->where(["orderCode"=>$info["orderCode"]])->find();
       $info['origin_price']=$orderinfo['origin_price'];
       $info['sale_price']=$orderinfo['sale_price'];
+      $info['order_type']=$orderinfo['order_type'];
       $info['total_price']=$orderinfo['total_price'];
       $info['addr_cn']=GetAddr($info['addr_code']);
-      $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, "未找到商品数据");
+      }
       if (empty($goon)) {
           return error_show(1003, "未找到商品数据");
       }