wesmiler hace 1 mes
padre
commit
b1bdfb668f

+ 2 - 1
app/Models/MeetingRecordsModel.php

@@ -38,8 +38,9 @@ class MeetingRecordsModel extends BaseModel
     public function meeting()
     {
         return $this->hasOne(MeetingModel::class, 'id','meeting_id')
+            ->with(['company','member'])
             ->where(['mark'=>1])
-            ->select(['id', 'title','thumb','bonus_rate', 'company', 'status']);
+            ->select(['id', 'title','thumb','user_id','bonus_rate','user_bonus_rate', 'company_id', 'status']);
     }
     
 }

+ 2 - 1
app/Models/OrderModel.php

@@ -75,7 +75,8 @@ class OrderModel extends BaseModel
     public function meeting()
     {
         return $this->hasOne(MeetingModel::class, 'id', 'meeting_id')
-            ->select(['id', 'title', 'thumb','company','bonus_rate']);
+            ->with(['company','member'])
+            ->select(['id', 'title', 'thumb','user_id','company_id','bonus_rate']);
     }
 
     /**

+ 5 - 0
app/Services/Api/OrderService.php

@@ -291,8 +291,11 @@ class OrderService extends BaseService
         $recordMeetingId = isset($record['meeting_id'])? $record['meeting_id'] : 0;
         $meeting = isset($record['meeting'])?$record['meeting'] : [];
         $meetingBonusRate = isset($meeting['bonus_rate'])?$meeting['bonus_rate'] : 0;
+        $meetingUserBonusRate = isset($meeting['user_bonus_rate'])?$meeting['user_bonus_rate'] : 0;
         $meetingBonusRate = $meetingBonusRate>0 && $meetingBonusRate<100? $meetingBonusRate : 0;
+        $meetingUserBonusRate = $meetingUserBonusRate>0 && $meetingUserBonusRate<100? $meetingUserBonusRate : 0;
         $meetingBonus = moneyFormat($orderTotal * $meetingBonusRate / 100, 2);
+        $meetingUserBonus = moneyFormat($orderTotal * $meetingUserBonusRate / 100, 2);
 
 
         // 是否开启分账功能
@@ -329,6 +332,8 @@ class OrderService extends BaseService
             'revenue_amount' => $revenueOpen==1?$revenueAmount:0,
             'meeting_bonus_rate' => $meetingBonusRate,
             'meeting_bonus' => $meetingBonus,
+            'meeting_user_bonus' => $meetingUserBonus,
+            'meeting_user_bonus_rate' => $meetingUserBonusRate,
             'create_time' => time(),
             'update_time' => time(),
             'status' => 1,