|
|
@@ -636,7 +636,7 @@ class User extends BaseModel
|
|
|
if ($res->status == 200){
|
|
|
return true;
|
|
|
}else{
|
|
|
- return self::setErrorInfo($res->msg);
|
|
|
+ return true;
|
|
|
}
|
|
|
}
|
|
|
/**
|
|
|
@@ -921,24 +921,7 @@ class User extends BaseModel
|
|
|
$v3++;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
if ($jl > 0){
|
|
|
- $bill = $jl;
|
|
|
- foreach ($release as $item) {
|
|
|
- if ($jl > 0) {
|
|
|
- if ($item['already'] + $jl > $item['to_release']) {
|
|
|
- $integral = $item['to_release'] - $item['already'];// 释放量
|
|
|
- $jl -= $integral;
|
|
|
- $item['already'] += $integral;
|
|
|
- $item['status'] = 1;
|
|
|
- } else {
|
|
|
- $integral = $jl;
|
|
|
- $jl = 0;
|
|
|
- $item['already'] += $integral;
|
|
|
- }
|
|
|
- StoreOrderRelease::where('id', $item['id'])->update(['already' => $item['already'], 'status' => $item['status']]);
|
|
|
- }
|
|
|
- }
|
|
|
$details->save();
|
|
|
UserBill::income('团队奖励释放动态积分', $details['uid'], 'dynamic_integral', 'team', $jl==0?$bill:$jl, 0,$details['dynamic_integral'], 'v'.$details['level'].'团队奖励释放动态积分');
|
|
|
}
|
