course fix

app/service/course/institution.js

@@ -48,6 +48,7 @@ class InstitutionService extends Service {
         const institutions = await ctx.classModel.CourseInstitution.findAll({ attributes, include, where });
 
         const institution_area_list = await this.getInstitutionAreaList(institutions);//将校区表处理成数组
+        // const from = { lat, lng };
         const area_lbs = await this.computeDistance(institution_area_list, { lat, lng });//计算距离信息
         const institution_areas = await this.findShortestDistanceAreas(institution_area_list, area_lbs);//查找最短距离并输出
         const ret = await this.formatInstitutions(institution_areas);
@@ -176,6 +177,10 @@ class InstitutionService extends Service {
 
         const { ctx } = this;
 
+        if (!Array.isArray(institutions) || institutions.length === 0) {
+            return [];
+        }
+
         const ret = [];
         for (let i in institutions) {
             let institution = institutions[i];
@@ -218,10 +223,20 @@ class InstitutionService extends Service {
     async computeDistance(lbs_array, from_gps, distance = 3) {
 
         const { ctx } = this;
+
+        if (!Array.isArray(lbs_array) || lbs_array.length === 0) {
+            return [];
+        }
+
         const from = from_gps;
+        console.info('11111111111111111111111111');
+        console.info(from_gps);
+        const lat = from_gps.lat;
+        const lng = from_gps.lng;
+        // console.info({ lat, lng });
         //计算距离
-        const driving_results = await ctx.service.course.lbs.getLBSDistance('driving', from, lbs_array);
-        const walking_results = await ctx.service.course.lbs.getLBSDistance('walking', from, lbs_array);
+        const driving_results = await ctx.service.course.lbs.getLBSDistance('driving', { lat, lng }, lbs_array);
+        const walking_results = await ctx.service.course.lbs.getLBSDistance('walking', { lat, lng }, lbs_array);
         if (!walking_results.results && !driving_results.results) {
             return [];
         }
@@ -269,7 +284,8 @@ class InstitutionService extends Service {
         const { ctx } = this;
 
         const ret = [];
-        const institution_lbs = await this.computeDistance(areas_list);
+        // const institution_lbs = await this.computeDistance(areas_list);
+        const institution_lbs = areas_list;
         for (let i in institution_areas) {
 
             let institution_area = institution_areas[i];

app/service/course/lbs.js

@@ -51,6 +51,7 @@ class LbsService extends Service {
     for (const v of toArr) {
       to.push(String(v.lat) + ',' + String(v.lng));
     }
+    console.info(from);
     const params = {
       mode, // driving, walking；默认driving
       from: String(from.lat) + ',' + String(from.lng),