|
|
@@ -11,11 +11,13 @@
|
|
|
|
|
|
namespace App\Services;
|
|
|
|
|
|
+use App\Models\MasterModel;
|
|
|
use App\Models\MemberModel;
|
|
|
use App\Models\SignCatesModel;
|
|
|
use App\Models\SignsModel;
|
|
|
use App\Models\SiyuanModel;
|
|
|
use App\Models\TradeModel;
|
|
|
+use App\Models\YigongModel;
|
|
|
|
|
|
/**
|
|
|
* 打卡签到管理-服务类
|
|
|
@@ -145,6 +147,22 @@ class SignsService extends BaseService
|
|
|
return message('您的账号已被冻结或不可操作,请联系客服', false);
|
|
|
}
|
|
|
|
|
|
+ if($type == 1){
|
|
|
+ $info = MasterModel::where(['user_id'=> $userId,'mark'=> 1,'status'=> 1])
|
|
|
+ ->select('id', 'realname','status')
|
|
|
+ ->first();
|
|
|
+ if(!$info){
|
|
|
+ return message('您还不是僧人或法师,请先到平台申请入驻', false);
|
|
|
+ }
|
|
|
+ }else if($type == 2){
|
|
|
+ $info = YigongModel::where(['user_id'=> $userId,'mark'=> 1,'status'=> 2])
|
|
|
+ ->select('id', 'realname','status')
|
|
|
+ ->first();
|
|
|
+ if(!$info){
|
|
|
+ return message('您还不是义工,请先到平台申请入驻', false);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if(time() < strtotime(date('Y-m-d 08:00')) || time() > strtotime(date('Y-m-d 20:00'))){
|
|
|
return message('每天8:00~20:00时间段才可打卡,请联系客服', false);
|
|
|
}
|
|
|
@@ -212,7 +230,7 @@ class SignsService extends BaseService
|
|
|
$isSettle = false;
|
|
|
$signSettle = ConfigService::make()->getConfigByCode('sign_settle');
|
|
|
$signSettle = $signSettle>0? $signSettle : false;
|
|
|
- if($type == 2 && $cateId == 2 && $signSettle){
|
|
|
+ if($type == 2 && $cateId == 2 && $signSettle==1){
|
|
|
$yigongSalary = ConfigService::make()->getConfigByCode('yg_salary');
|
|
|
$signStartTime = isset($checkInfo['sign_at']) && $checkInfo['sign_at']? strtotime($checkInfo['sign_at']) : 0;
|
|
|
$signEndTIme = strtotime(date('Y-m-d H:i'));
|