|
|
@@ -41,7 +41,22 @@ class StoreExchangeOrder extends BaseModel
|
|
|
} else {
|
|
|
$model = $model->order('a.id desc');
|
|
|
}
|
|
|
- return ($data = $model->page((int)$where['page'], (int)$where['limit'])->select()) && count($data) ? $data->toArray() : [];
|
|
|
+ return ($data = $model->page((int)$where['page'], (int)$where['limit'])->select()->each(function ($v){
|
|
|
+ $v['nickname'] = User::where('uid', $v['uid'])->value('nickname');
|
|
|
+ $v['giftnickname'] = User::where('uid', $v['gift_uid'])->value('nickname');
|
|
|
+ $v['status_name'] = $v['status'] == 1 ? "已使用" : "未使用";
|
|
|
+ $_info = StoreOrderCartInfo::where('cart_id', $v['cart_id'])->field('cart_info')->select();
|
|
|
+ $_info = count($_info) ? $_info->toArray() : [];
|
|
|
+ foreach ($_info as $k => $vv) {
|
|
|
+ $cart_info = $vv['cart_info'];
|
|
|
+ if (!isset($cart_info['productInfo'])) $cart_info['productInfo'] = [];
|
|
|
+ $_info[$k]['cart_info'] = $cart_info;
|
|
|
+ unset($cart_info);
|
|
|
+ }
|
|
|
+ $v['_info'] = $_info;
|
|
|
+ $v['store'] = SystemStore::where('id', $v['store_id'])->value('name') ?: '--';
|
|
|
+ $v['add_time'] = $v['add_time'] ? date('Y-m-d H:i:s', $v['add_time']) : '';
|
|
|
+ })) && count($data) ? $data->toArray() : [];
|
|
|
}
|
|
|
|
|
|
public static function getList($where)
|
Kirin