Merge remote-tracking branch 'origin/dev' into dev

app/api/controller/RemoteController.php

@@ -21,7 +21,6 @@ class RemoteController extends BaseApiController
         if (isset($arr['start_time']) && $arr['end_time']) {
             $start_time = $arr['start_time'];
             $end_time = $arr['end_time'];
-
         }
         $parmas = [
             "start_date" => $start_time,
@@ -98,20 +97,15 @@ class RemoteController extends BaseApiController
         }
     }
 
-    public function shang_date_list($company,$is_day,$querys){
+    public function shang_date_list($company, $querys)
-        if($is_day==1){
+    {
         $start_time = date('Y-m-d');
         $time = strtotime($start_time) + 86399;
         $end_time = date('Y-m-d H:i:s', $time);
-        }else{
+
-            $start_time = date('Y-m-d',strtotime('-1 day', time()));
-            $time=strtotime($start_time)+86399;
-            $end_time=date('Y-m-d H:i:s',$time);
-        }
         if (isset($querys['start_time']) && isset($querys['end_time'])) {
             $start_time = $querys['start_time'];
             $end_time = $querys['end_time'];
-
         }
         $parmas = [
             "start_date" => $start_time,
@@ -165,14 +159,14 @@ class RemoteController extends BaseApiController
         } catch (\Exception $e) {
             return false;
         }
-
     }
 
     /**
      * 
      * 获取坐标的距离
      */
-    public function coordinate($parmas,$longitude1,$latitude1){
+    public function coordinate($parmas, $longitude1, $latitude1)
+    {
         $res = HttpClient::create()->request('GET', env('project.logistic_domain') . '/api/getCarHistory', [
             'query' => $parmas,
         ]);
@@ -187,14 +181,14 @@ class RemoteController extends BaseApiController
         ];
         $closestPoint = $this->getClosestPoint($points, $target);
         return $this->calculateDistance($target['lon'], $target['lat'], $closestPoint[0]['lon'], $closestPoint[0]['lat']);
-
     }
 
     /**
      * 
      * 计算两点之间的距离
      */
-    function getClosestPoint($points, $target) {
+    function getClosestPoint($points, $target)
+    {
         $minDistance = PHP_INT_MAX;
         $closestPoint = null;
         foreach ($points as $point) {
@@ -215,7 +209,8 @@ class RemoteController extends BaseApiController
      * 
      * 计算两点之间的距离
      */
-    function calculateDistance( $longitude1,$latitude1, $longitude2,$latitude2 ) {
+    function calculateDistance($longitude1, $latitude1, $longitude2, $latitude2)
+    {
         $earthRadius = 6371; // 地球半径，单位为公里
 
         $dLat = deg2rad($latitude2 - $latitude1);

app/api/controller/TaskController.php

@@ -62,12 +62,12 @@ class TaskController extends BaseApiController
                 if ($find != false) {
                     if($time<time()){
                         $transaction_pool=TaskTemplate::where('id',$item['template_id'])->value('transaction_pool');
-                        if($transaction_pool==0){
-                            $find['arr']['transaction_pool']=0;
-                        }else{
-                            $find['arr']['transaction_pool']=$transaction_pool;
-                        }
                         $res[$k]['extend']['transaction'] = $find;
+                        if($transaction_pool==0){
+                            $res[$k]['extend']['transaction']['arr']['transaction_pool']=$find['arr']['total_price'];
+                        }else{
+                            $res[$k]['extend']['transaction']['arr']['transaction_pool']=bcadd($res[$k]['extend']['transaction']['arr']['total_price'],$transaction_pool,2);
+                        }
                     }
                     // Task::where('id',$item['id'])->update(['extend'=>json_encode(['transaction'=>$find],true)]);
                 } else {
@@ -93,13 +93,19 @@ class TaskController extends BaseApiController
         // $list = App(RemoteController::class)->shang_date_list($company, 1, $parmas);
         $parmas['start_time']=date('Y-m-d',$task['start_time']);
         $parmas['end_time']=$task['end_time'].' 23:59:59';
-        $list = App(RemoteController::class)->shang_date_list($company, 1, $parmas);
+        $list = App(RemoteController::class)->shang_date_list($company, $parmas);
+        $shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company,$parmas,$task['template_id']);
         if ($task != false) {
             $find['list'] = $list;
             if($transaction_pool==0){
-                $task['extend']['transaction']['arr']['transaction_pool']=0;
+                $task['extend']['transaction']['arr']['transaction_pool']=$shang_date_total_price['arr']['total_price'];
             }else{
-                $task['extend']['transaction']['arr']['transaction_pool']=$transaction_pool;
+                $task['extend']['transaction']['arr']['transaction_pool']=bcadd($shang_date_total_price['arr']['total_price'],$transaction_pool,2);
+            }
+            if($task['start_time']<strtotime(date('Y-m-d'))){
+                $task['extend']['transaction']['arr']['is_show']=false;
+            }else{
+                $task['extend']['transaction']['arr']['is_show']=true;
             }
             $find['extend']=$task['extend'];
             return $this->success('ok', $find);

app/job/TaskInformationJob.php

@@ -44,7 +44,8 @@ class TaskInformationJob
             } elseif
             //交易金额
             ($data['template_info']['type'] == 33) {
-                $shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company);
+                $shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company,[],$data['template_id']);
+
                 if ($shang_date_total_price == false) {
                     Log::info('交易金额任务，交易金额未达到要求：' . json_encode($data));
                     Task::where('id', $data['task_id'])->update(['status' => 5]);
@@ -55,8 +56,8 @@ class TaskInformationJob
                 if($count_money>$shang_date_total_price['arr']['day_money']){
                     $day_money=bcsub($count_money,$shang_date_total_price['arr']['day_money'],2);//当计算剩余池before_transaction_pool
                     $shang_date_total_price['arr']['before_transaction_pool']=$transaction_pool;//变化前
+                    $shang_date_total_price['arr']['after_count_transaction_pool']=$count_money;//变化后
                     $shang_date_total_price['arr']['after_transaction_pool']=$day_money;//变化后
-
                     Task::where('id', $data['task_id'])->update(['status' => 3,'extend'=>json_encode(['transaction'=>$shang_date_total_price])]);
                     TaskTemplate::where('id',$data['template_info']['id'])->update(['transaction_pool'=>$day_money]);
                     $shang_date_total_price['arr']['status']=1;