|
@@ -241,6 +241,7 @@ class WechatUser extends BaseModel
|
|
|
$export = [];
|
|
|
$broken_time = intval(sys_config('extract_time'));
|
|
|
$search_time = time() - 86400 * $broken_time;
|
|
|
+ $search_time = date('Y-m-d H:i:s', $search_time);
|
|
|
foreach ($data as &$item) {
|
|
|
if ($spread_uid = User::where('uid', $item['uid'])->value('spread_uid')) {
|
|
|
if ($user = User::where('uid', $spread_uid)->field(['uid', 'nickname'])->find()) {
|
|
@@ -333,7 +334,7 @@ class WechatUser extends BaseModel
|
|
|
}
|
|
|
}
|
|
|
if (isset($where['data']) && $where['data']) $model = self::getModelTime($where, $model, "{$alias}add_time");
|
|
|
- return $model->where("{$alias}is_del", 0)->where("{$alias}is_system_del", 0)->where($alias . 'paid', 1)->where('seckill_id&bargain_id&combination_id','=',0);
|
|
|
+ return $model->where("{$alias}is_del", 0)->where("{$alias}is_system_del", 0)->where($alias . 'paid', 1)->where('seckill_id&bargain_id&combination_id', '=', 0);
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -535,7 +536,7 @@ class WechatUser extends BaseModel
|
|
|
$item['avatar'] = $userInfo->avatar;
|
|
|
}
|
|
|
$item['spread_info'] = $Info->nickname . "|" . ($Info->phone ? $Info->phone . "|" : '') . $Info->uid;
|
|
|
- $item['number_price'] = UserBill::where(['uid'=>$Info['uid'], 'category' => 'now_money', 'type' => 'brokerage', 'link_id' => $item['id']])->value('number');
|
|
|
+ $item['number_price'] = UserBill::where(['uid' => $Info['uid'], 'category' => 'now_money', 'type' => 'brokerage', 'link_id' => $item['id']])->value('number');
|
|
|
$item['_pay_time'] = date('Y-m-d H:i:s', $item['pay_time']);
|
|
|
$item['_add_time'] = date('Y-m-d H:i:s', $item['add_time']);
|
|
|
$item['take_time'] = ($change_time = StoreOrderStatus::where(['change_type' => 'user_take_delivery', 'oid' => $item['id']])->value('change_time')) ?
|