ad

app/admin/controller/OrderPay.php

@@ -284,6 +284,11 @@ class OrderPay extends BaseController{
            $page=$page>$total? intval($total):$page;
            $list =Db::name("trade")->where($condition)->page($page,$size)->order("addtime desc")->select()->toArray();
            foreach ($list as &$value){
+//           	$data = Db::name("trade_pool")->alias("a")
+//           	->leftJoin("assoc b","a.")
+//           	->where(["tradNo"=>$value['tradNo'],"is_del"=>0])
+//           	->order("addtime desc")
+//           	->select()->toArray();
                $value['child']=Db::name("trade_pool")->where(["tradNo"=>$value['tradNo'],"is_del"=>0])->order("addtime desc")->select()->toArray();
            }
            return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);

app/admin/controller/Payment.php

@@ -171,7 +171,7 @@ class Payment extends BaseController
        $data=[];
         foreach ($list as $key=>$value){
             $value['ordeNum'] = Db::name("pay_info")->where([["payNo","=",$value["payNo"]],["is_del","=",0]])->count();
-            $tag =Db::name("order_tag")->where(["id"=>$value['tag_id'],"is_del"])->value("tag_name",'');
+            $tag =Db::name("order_tag")->where(["id"=>$value['tag_id'],"is_del"=>0])->value("tag_name",'');
             $value['tag_name']=$tag;
             $data[]=$value;
         }

app/admin/controller/Sale.php

@@ -99,7 +99,7 @@ class Sale extends BaseController{
         $data=[];
         foreach ( $list as $ky=>$value){
             $value['catInfo'] = json_decode($value['catInfo'],true);
-            $tag =Db::name("order_tag")->where(["id"=>$value['tag_id'],"is_del"])->value("tag_name",'');
+            $tag =Db::name("order_tag")->where(["id"=>$value['tag_id'],"is_del"=>0])->value("tag_name",'');
             $value['tag_name']=$tag;
             $data[]=$value;