|
|
@@ -85,7 +85,7 @@ class Proxy extends Model
|
|
|
// 有活动又有单独设置，按照单独设置为准
|
|
|
// 有活动没有单独设置，按照活动为准
|
|
|
|
|
|
- if ($proxyUid = \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 {
|
|
|
@@ -223,6 +223,7 @@ author:wsl
|
|
|
$areasetting=Proxy::whereUserLevel($level)->whereUid(0)->whereStatus(1)
|
|
|
->whereProvince($province)->whereCity($city)->whereDistrict($district)
|
|
|
->first();
|
|
|
+
|
|
|
$globsetting=Proxy::whereUserLevel($level)->whereUid(0)
|
|
|
->whereProvince(0)->whereCity(0)->whereDistrict(0)
|
|
|
->first()->toArray();
|
APPLE