|
@@ -1032,8 +1032,7 @@ class Purchin extends Base
|
|
|
$page = $page >= $total ? $total : $page;
|
|
|
$list = Db::name('purchease_return')->alias('a')->join("purchease_order b","b.cgdNo=a.cgdNo","left")
|
|
|
->where($where)->page($page,$size)
|
|
|
- ->field("a.returnCode,b.spuCode,a.good_catid,a.return_num,a.good_price,a.good_total,
|
|
|
- a.post_company,a.post_fee,a.status,a.cgdNo,b.good_name,b.order_type")->order("a.addtime desc")->select();
|
|
|
+ ->field("a.*,b.spuCode,b.good_price,b.total_fee,b.good_name")->order("a.addtime desc")->select();
|
|
|
$data=[];
|
|
|
foreach ($list as $value){
|
|
|
$value['can']= isset($value['good_catid']) && $value['good_catid'] !=0 ? made($value['good_catid']):[];
|