wyk/juipphp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

维护用户排序时间搜索

Browse Source
This commit is contained in:
wanyongkang
2020-11-24 15:22:25 +08:00
parent 4736fdd979
commit a326346f5b
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/manager/controller/UserFollow.php
View File

@@ -5,7 +5,7 @@
* @Author: kangkang
* @Date: 2020-10-13 19:52:37
* @LastEditors: Please set LastEditors
* @LastEditTime: 2020-11-24 14:55:57
* @LastEditTime: 2020-11-24 15:14:39
*/
namespace app\manager\controller;
@@ -78,16 +78,13 @@ class UserFollow extends Controller
$date3 = date("Y-m-01", time());
$date4 = date("Y-m-d H:i:s", time());
if (!empty($search['last_month']['s_time'])) {
$date1 = date('Y-m-d',strtotime($search['last_month']['s_time']));
$date2 = date('Y-m-d 23:59:59',strtotime($search['last_month']['e_time']));
$is_screen = true;
$date1 = date('Y-m-d', strtotime($search['last_month']['s_time']));
$date2 = date('Y-m-d H:i:s', strtotime($search['last_month']['e_time']));
} elseif (!empty($search['new_month']['s_time'])) {
$date3 = date('Y-m-d',strtotime($search['new_month']['s_time']));
$date4 = date('Y-m-d 23:59:59',strtotime($search['new_month']['e_time']));
$is_screen = true;
$date3 = date('Y-m-d', strtotime($search['new_month']['s_time']));
$date4 = date('Y-m-d H:i:s', strtotime($search['new_month']['e_time']));
}
//上月
$time_where1 .= " UpdateTime>='" . $date1 . "' and UpdateTime<='" . $date2 . "' ";
//本月
@@ -157,7 +154,7 @@ class UserFollow extends Controller
foreach ($user_list as $info) {
$info['last_pay_time'] = '无消费';
$pay_time = $product_order_model->getNewOne('UpdateTime', ['UserId' => $info['Id'], 'ScoreType' => ProductOrderEnum::$PayComplete]);
$pay_time = $product_order_model->getNewOne('UpdateTime', ['UserId' => $info['Id'], 'OrderState' => ['in', ProductOrderEnum::$PayComplete]]);
if ($pay_time) {
$info['last_pay_time'] = $pay_time['UpdateTime'];
}
@@ -256,7 +253,7 @@ class UserFollow extends Controller
$user_model = new User;
$user_enum = new UserEnum;
if ($user_model->updateOne(['Id' => $data['user_id']], ['follow_status' => $data['status']])) {
$follow_rcord->updateOne(['user_id'=>$data['user_id']],['active' => 0]);
$follow_rcord->updateOne(['user_id' => $data['user_id']], ['active' => 0]);
$info = [];
$info['user_id'] = $data['user_id'];
$info['op_user'] = $this->userinfo['OperaterID'];