|
|
@@ -77,14 +77,15 @@ class Proxy extends Model
|
|
|
if(empty($proxy->id)){
|
|
|
$proxy = Proxy::whereUserLevel($level)->whereStatus(1)->where(['area_type' => 3, 'province' => $province, 'city' => $city, 'district' => $district])->first();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$num = $proxy? $proxy->free_num : 0;
|
|
|
+ $proxyUid = $proxy? $proxy->uid : 0;
|
|
|
$free_num = 0; // 剩余免费次数
|
|
|
|
|
|
// 有活动又有单独设置，按照单独设置为准
|
|
|
// 有活动没有单独设置，按照活动为准
|
|
|
|
|
|
- if ($proxy->uid = \Auth::id() && $num > 0) {
|
|
|
+ if ($proxyUid = \Auth::id() && $num > 0) {
|
|
|
$free_num = $num;
|
|
|
//$free_num = $proxyConfig->free_num - AdverActivityLog::whereActivityId(0)->whereUid(\Auth::id())->whereStatus(3)->sum('free_num');
|
|
|
} else {
|
APPLE