Merge branch 'tuancan' into test

application/services/marketing/TakePlaceService.php

@@ -203,7 +203,7 @@ class TakePlaceService
         if(!empty($list) && is_array($list)) {
             foreach ($list as &$item) {
                 if($item['longitude'] && $item['latitude']) {
-                    $item['distance'] = Geo::geoDistance($lat,$lng,$item['latitude'],$item['longitude'],true);
+                    $item['distance'] = Geo::geoDistance($lat,$lng,$item['longitude'],$item['latitude'],true);
                     $sort[] = $item['distance'];
                 }else {
                     $item['distance'] = '';