Merge remote-tracking branch 'origin' into zhangwei

app/common/model/informationg/UserInformationg.php

@@ -38,7 +38,7 @@ class UserInformationg extends BaseModel
     {
         return self::where($param)->with('company')
             ->field('id,area_id,area_id as area_name,street_id,street_id as street_name,village_id,village_id as village_name, street_id as street_name,brigade_id,brigade_id as brigade_name,name,phone,age,address,create_time,update_time')
-            ->order('id', 'desc')
+            ->order('update_time', 'desc')
             ->page($page)->limit($size)->select();
     }
 

app/job/TaskInformationJob.php

@@ -44,6 +44,8 @@ class TaskInformationJob
                     Log::info('任务结算失败，交易金额未达到要求：' . json_encode($data));
                     Task::where('id', $data['task_id'])->update(['status' => 5,'extend'=>json_encode($shang_date_total_price)]);
                     return false;
+                }else{
+                    Task::where('id', $data['task_id'])->update(['status' => 3,'extend'=>json_encode($shang_date_total_price)]);
                 }
                 $name = $shang_date_total_price['name'];
                 $arr['status'] = $shang_date_total_price['arr']['status'];