one_after 3 maanden geleden
bovenliggende
commit
4cdea9897c
2 gewijzigde bestanden met toevoegingen van 4 en 14 verwijderingen
  1. 0 9
      app/business/PayorderBusiness.php
  2. 4 5
      app/business/TaskBusiness.php

+ 0 - 9
app/business/PayorderBusiness.php

@@ -360,13 +360,6 @@ class PayorderBusiness
             if ($goodsData->type == 1) {
                 if (!empty($goodsData->bonus)) {
 
-                    $event_time = '1764518340';
-                    if (time() <= $event_time) {
-                        $is_activity = 2;
-                    } else {
-                        $event_time  = 0;
-                        $is_activity = 0;
-                    }
                     Db::table('wa_cron_task')->insert([
                         'user_id'           => $data['user_id'],
                         'goods_id'          => $goodsData->id,
@@ -382,8 +375,6 @@ class PayorderBusiness
                         'created_at'        => $thisDay,
                         'updated_at'        => $thisDay,
                         'my_good_id'        => $myGoodsId,
-                        'event_time'        => $event_time,
-                        'is_activity'       => $is_activity,
                     ]);
                     StreamBusiness::addStream($data['user_id'], $goodsData->bonus, streamType9, moldType7, moldTypefild7, $data['id']);
 

+ 4 - 5
app/business/TaskBusiness.php

@@ -40,12 +40,11 @@ class TaskBusiness
                 $usersData = Db::table('wa_users')->where('id', $cronTask->user_id)->first();
 
                 if (empty($has) && !empty($usersData)) {
-                    if ($cronTask->is_activity > 0 && $cronTask->event_time < time() && $cronTask->event_time > 0) {
-                        $bonus = bcdiv($cronTask->bonus, $cronTask->is_activity, 2);
-                    } else {
-                        $bonus = $cronTask->bonus;
+
+                    $bonus = Db::table('wa_goods')->where('id',$cronTask->goods_id)->value('original_bonus');
+                    if(!empty($bonus)){
+                        StreamBusiness::addStream($usersData->id, $bonus, streamType9, moldType7, moldTypefild7, $taskId);
                     }
-                    StreamBusiness::addStream($usersData->id, $bonus, streamType9, moldType7, moldTypefild7, $taskId);
                     if (!empty($usersData->pid) && !empty($cronTask->rebate)) {
                         StreamBusiness::addStream($usersData->pid, $cronTask->rebate, streamType9, moldType9, moldTypefild9, $taskId);
                     }