| xqd
@@ -960,13 +960,14 @@ class AlbumController extends Controller
|
|
|
if($userAuth->is_dealer!=1) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '该用户不是经销商!', $validator->messages());
|
|
|
// if($userAuth->up_agent_id==0) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未选择经销商!', $validator->messages());
|
|
|
$user_agent = AlbumAgentModel::where('user_id',$userAuth->id)->first();
|
|
|
- $count_user = AlbumWatchRecord::where([['agent_id',$user_agent->id],['store_id',$store_id],['updated_at','>=',$start],['updated_at','<=',$end]])->groupBy('open_id')->get();
|
|
|
+ $count_user = AlbumWatchRecord::where([['agent_id',$user_agent->id],['store_id',$store_id],['updated_at','>=',$start],['updated_at','<=',$end]])->orderBy('id DESC')->groupBy('open_id')->get();
|
|
|
|
|
|
$users = Array();
|
|
|
if($count_user){
|
|
|
foreach($count_user as $key=>$val){
|
|
|
$user = AlbumUserModel::where([['open_id',$val->open_id],['store_id',$val->store_id]])->select(['id','username','avatar','phone','open_id'])->first();
|
|
|
$customer = CustomerDetailsModel::where([['store_id',$store_id],['open_id',$val->open_id],['agent_id',$user_agent->id]])->first(['purpose_level','comment','tips']);
|
|
|
+ $user->time = $val->updated_at;
|
|
|
if($customer){
|
|
|
$user->purpose_level = $customer->purpose_level;
|
|
|
$user->comment = $customer->comment;
|