wesmiler 1 тиждень тому
батько
коміт
e5550352a6
1 змінених файлів з 2 додано та 3 видалено
  1. 2 3
      app/Services/Api/SettleService.php

+ 2 - 3
app/Services/Api/SettleService.php

@@ -146,10 +146,9 @@ class SettleService extends BaseService
             $pointInfo = MemberModel::where(['id' => $pointId,'mark'=>1])
                 ->select(['id','nickname','buy_type','bonus_status','status','mark'])
                 ->first();
-            $buyType = isset($pointInfo['buy_type'])?$pointInfo['buy_type']:0;
             $bonusStatus = isset($pointInfo['bonus_status'])?$pointInfo['bonus_status']:0;
             $data['direct_uid'] = $pointId;
-            if($pointInfo && $buyType==$mealId && $bonusStatus==1){
+            if($pointInfo && $bonusStatus==1){
                 $data['direct_bonus'] = json_encode(['uid'=>$pointId,'bonus'=>$directBonus],256);
             }else{
                 $data['direct_bonus']= json_encode(['uid'=>$pointId,'direct_bonus'=>$directBonus,'meal_id'=>$mealId,'error'=>'节点推荐人不存在或收益已领完','point'=>$pointInfo],256);
@@ -204,7 +203,7 @@ class SettleService extends BaseService
                         'weight_bonus'=> $levelBonus,
                         'level_bonus'=> 0,
                     ];
-                    if($pMark==1 && $buyType==$mealId && $bonusStatus==1){
+                    if($pMark==1 && $bonusStatus==1){
                         $bonusData['jd_bonus'] = $jdBonus;
                     }else{
                         $errors["bonus_{$layer}_uid_jd"]=['uid'=>$pid,'bonus'=>$jdBonus,'error'=>"上{$layer}级节点推荐人不存在或收益已领完",'point'=>$point];