|
|
@@ -49,8 +49,9 @@ class AuctionOrder extends BaseModel
|
|
|
->leftJoin('user c', 'a.collection_id = c.uid')
|
|
|
->leftJoin('auction_pay pay', 'a.collection_id = pay.uid')
|
|
|
->where('a.order_id', $data['order_id'])->find();
|
|
|
+ $product = AuctionProduct::where('id', $list['product_id'])->find();
|
|
|
+ $list['actual_price'] = $list['price'] - $product['fictitious_price'];
|
|
|
$pay = AuctionPay::where('uid', $list['collection_id'])->select();
|
|
|
-
|
|
|
$list['wx'] = [];
|
|
|
$list['zfb'] = [];
|
|
|
$list['bank'] = [];
|
|
|
@@ -85,6 +86,7 @@ class AuctionOrder extends BaseModel
|
|
|
$list[$k]['product_id'] = $v['id'];
|
|
|
$list[$k]['is_gs'] = 0;
|
|
|
$list[$k]['order_id'] = $list[$k]['order'];
|
|
|
+ $list[$k]['price'] = $v['hanging_price'];
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
@@ -112,6 +114,10 @@ class AuctionOrder extends BaseModel
|
|
|
->field('a.*,u.nickname,u.avatar,u.uid as user_id')
|
|
|
->leftJoin('user u', 'a.uid = u.uid')
|
|
|
->where('a.order_id', $data['order_id'])->find();
|
|
|
+ $product = AuctionProduct::where('id', $list['product_id'])->find();
|
|
|
+ $list['actual_price'] = $list['price'] - $product['fictitious_price'];
|
|
|
+ $list = empty($list) ? [] : $list->toArray();
|
|
|
+ return $list;
|
|
|
} else {
|
|
|
if ($data['type'] == 1) {
|
|
|
$status = 1;
|
