Merge branch 'master' of https://t-git.51gjj.com/fangbin/51business

app/service/common/sms.js

@@ -33,7 +33,7 @@ class SmsService extends Service {
         if (!(/【51公积金】/.test(params.params.content))) {
             params.params.content = '【51公积金】' + params.params.content;
         }
-        ctx.logger.info(params);
+        ctx.logger.info(JSON.stringify(params));
         let result = await ctx.helper.send_request(url, params, { method: 'POST' });
         return result;
     }

app/service/course/institution.js

@@ -74,7 +74,7 @@ class InstitutionService extends Service {
     }
     // const institution_areas = await this.findShortestDistanceAreas(institution_area_list, area_lbs);// 查找最短距离并输出
     // const ret = await this.formatInstitutions(institution_areas);
-    const ret = await this.formatInstitutions(area_distance);
+    const ret = await this.formatInstitutions(area_distance, distance);
 
     return { count: area_distance_list.count, rows: ret };
   }
@@ -516,7 +516,7 @@ class InstitutionService extends Service {
     return results;
   }
 
-  async formatInstitutions(institutions) {
+  async formatInstitutions(institutions, distance = 0) {
 
     const { ctx } = this;
     if (!Array.isArray(institutions) || institutions.length === 0) {
@@ -541,6 +541,9 @@ class InstitutionService extends Service {
     let ret = [];
     for (const i in institutions) {
       const institution = institutions[i];
+      if (distance > 0 && distance < institution.distance * 1000) {
+        continue;
+      }
       // const course_areas = institution.course_areas;
       // if (!course_areas || course_areas.length === 0) continue;
       const age_tag = institution.min_age + '-' + institution.max_age + '岁';