|
|
@@ -319,7 +319,7 @@ class OrderPay extends BaseController{
|
|
|
->leftJoin("qrd_info c", "b.orderCode=c.sequenceNo")
|
|
|
->where(["a.tradNo" => $value['tradNo'], "a.is_del" => 0])
|
|
|
->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
|
|
|
- ->field("a.*,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.customerName,c.customerNo")
|
|
|
+ ->field("a.*,b.orderCode,c.cxCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.customerName,c.customerNo")
|
|
|
->select()
|
|
|
->toArray();
|
|
|
$value['child'] = $data;
|
|
|
@@ -395,7 +395,7 @@ class OrderPay extends BaseController{
|
|
|
->where($condition)
|
|
|
->page($page,$size)
|
|
|
->field("a.*,b.trade_bank,b.trade_account,b.trade_out,b.total_fee as btotal_fee,b.used_fee,b.balance,c.customerName,c.customerNo,
|
|
|
- d.orderCode,c.qrdSource,c.goodNo,c.goodName,c.qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName,c.totalPrice,d.cancel_fee")
|
|
|
+ d.orderCode,c.qrdSource,c.cxCode,c.goodNo,c.goodName,c.qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName,c.totalPrice,d.cancel_fee")
|
|
|
->order("a.addtime desc")->select();
|
|
|
return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
|
|
|
}
|
