【Mod】恢复周期

app/Http/Controllers/Api/Lottery/Recruitment.php

@@ -71,8 +71,7 @@ class Recruitment extends Api{
 		$map							= [];
 		// 判断周期
 		if( !empty($data['freq']) )		{
-			if( $data['freq'] == 1 )	$map = [['insert_time','>=',now()->addMinutes(-10)->getTimestamp()],['insert_time','<=',now()->endOfDay()->getTimestamp()]];
-			// if( $data['freq'] == 1 )	$map = [['insert_time','>=',now()->startOfDay()->getTimestamp()],['insert_time','<=',now()->endOfDay()->getTimestamp()]];
+			if( $data['freq'] == 1 )	$map = [['insert_time','>=',now()->startOfDay()->getTimestamp()],['insert_time','<=',now()->endOfDay()->getTimestamp()]];
 			if( $data['freq'] == 2 )	$map = [['insert_time','>=',now()->startOfWeek()->getTimestamp()],['insert_time','<=',now()->endOfWeek()->getTimestamp()]];
 			if( $data['freq'] == 3 )	$map = [['insert_time','>=',now()->startOfMonth()->getTimestamp()],['insert_time','<=',now()->endOfMonth()->getTimestamp()]];
 		}
@@ -156,8 +155,7 @@ class Recruitment extends Api{
 		$map							= [];
 		// 判断周期
 		if( !empty($data['freq']) )		{
-			if( $data['freq'] == 1 )	$map = [['insert_time','>=',now()->addMinutes(-10)->getTimestamp()],['insert_time','<=',now()->endOfDay()->getTimestamp()]];
-			// if( $data['freq'] == 1 )	$map = [['insert_time','>=',now()->startOfDay()->getTimestamp()],['insert_time','<=',now()->endOfDay()->getTimestamp()]];
+			if( $data['freq'] == 1 )	$map = [['insert_time','>=',now()->startOfDay()->getTimestamp()],['insert_time','<=',now()->endOfDay()->getTimestamp()]];
 			if( $data['freq'] == 2 )	$map = [['insert_time','>=',now()->startOfWeek()->getTimestamp()],['insert_time','<=',now()->endOfWeek()->getTimestamp()]];
 			if( $data['freq'] == 3 )	$map = [['insert_time','>=',now()->startOfMonth()->getTimestamp()],['insert_time','<=',now()->endOfMonth()->getTimestamp()]];
 		}
@@ -168,7 +166,7 @@ class Recruitment extends Api{
 		// 如果次数不够
 		if( $data['join_num'] <= 0 )	return json_send(['code'=>'error','msg'=>'抽奖次数已用完','data'=>['error'=>'抽奖次数已用完']]);
 		// 抽奖记录
-		$record							= ['custom_uid'=>$uid,'lottery_id'=>$lotteryId,'reward_id'=>0,'reward_name'=>0,'status'=>1];
+		$record							= ['custom_uid'=>$uid,'lottery_id'=>$lotteryId,'reward_id'=>0,'reward_name'=>'谢谢参与','status'=>8];
 		// 开启事务
 		DB::beginTransaction();
 		try{
@@ -220,8 +218,12 @@ class Recruitment extends Api{
                             $record['status']= 8;
                         }
                     }
+					// 如果是实物，要求填写地址，状态设置为0
+                    if( $rewardResult['reward_type'] == 4 ) $record['status'] = 1;
                     // 如果是实物，要求填写地址，状态设置为0
                     if( $rewardResult['reward_type'] == 5 ) $record['status'] = 0;
+					// 如果是实物，要求填写地址，状态设置为0
+                    if( $rewardResult['reward_type'] == 6 ) $record['status'] = 1;
                 }
             }
 			// 中奖记录奖品

app/Models/WeiBan/Tags.php

@@ -1,11 +1,8 @@
 <?php namespace App\Models\WeiBan;
 
-use App\Facades\Servers\WechatWork\CorpTag;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
-use function PHPUnit\Framework\returnSelf;
-
 /**
  * 客户-客服标签模型
  *