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

app/controller/course/institution.js

@@ -22,7 +22,9 @@ class InstitutionController extends Controller {
     async institutionInfo() {
 
         const { ctx } = this;
-        const input_params = ctx.params;
+        let input_params = ctx.params;
+        const query = ctx.query;
+        input_params = Object.assign(input_params, query);
         const result = await ctx.service.course.institution.getInstitution(input_params);
 
         ctx.success({ result });

app/model/class/course_institution.js

@@ -28,6 +28,8 @@ module.exports = app => {
         price: STRING,
         characteristic: STRING,
         description: TEXT,
+        honor: STRING,
+        point: STRING,
         status: ENUM('offline', 'online'),
         is_deleted: INTEGER,
         created_time: {

app/service/course/institution.js

@@ -59,14 +59,47 @@ class InstitutionService extends Service {
     /**
      * 机构详情页
      */
-    async getInstitution({ institution_id, area_id }) {
+    async getInstitution(input) {
 
         const { ctx } = this;
-
+        const user_uuid = ctx.userUuid;
+        const { institution_id, area_id, lat, lng } = input;
         const institution = await ctx.classModel.CourseInstitution.one({ where: { id: institution_id } });
         const teachers = await this.getTeachers({ institution_id, limit: 6 });
         const classes = await this.getClasses({ institution_id, limit: 4 });
-        const areas = await this.getInstitutionAreas({ institution_id, limit: 1000 });//校区
+        const areas_ret = await this.getInstitutionAreas({ institution_id, limit: 1000 });//校区
+
+        //计算校区距离
+        const area_rows = areas_ret.rows;
+        const area_lbs = await this.computeDistance(area_rows, { lat, lng });//计算距离信息
+        const areas = [];
+        for (let i in area_rows) {
+
+            const area = area_rows[i];
+            const lbs = area_lbs[i];
+            const area_name = area.name;
+            const distance = lbs.distance;
+            const duration = lbs.duration;
+
+            let travel_tips = `距我${distance}km,开车${duration}分钟`;
+            if (lbs.travel_method === 'walking') {
+                travel_tips = `距我${distance}km,步行${duration}分钟`;
+            }
+            if (distance === 0 && duration === 0) {
+                travel_tips = '暂无法计算出距离';
+            }
+            areas.push({
+                id: area.id,
+                institution_id: area.institution_id,
+                name: area_name,
+                address: area.address,
+                phone: area.phone,
+                travel_tips,
+                lat: area.lat,
+                lng: area.lng,
+            });
+        }
+
         const institution_images = await ctx.classModel.CourseImages.all({ where: { type: 1, type_id: institution_id } });//图片
 
         //处理详情页信息
@@ -76,6 +109,16 @@ class InstitutionService extends Service {
         institution_detail.address = current_area.address;
         institution_detail.phone = current_area.phone;
         institution_detail.description = institution.description;
+        institution_detail.point = institution.point;
+        institution_detail.honor = institution.honor;
+        institution_detail.is_collect = 0;
+
+        //是否收藏过
+        const collection_ret = await ctx.classModel.CourseUserCollection.one({ where: { user_uuid, institution_id, is_deleted: 0 } });
+        if (collection_ret && collection_ret.id) {
+            institution_detail.is_collect = 1;
+        }
+
 
         //处理图片
         const photo_album = [];
@@ -89,7 +132,7 @@ class InstitutionService extends Service {
         }
         institution_detail.photo_album = photo_album;
 
-        return { institution_detail, teachers: teachers.rows, classes: classes.rows, areas: areas.rows };
+        return { institution_detail, teachers: teachers.rows, classes: classes.rows, areas: areas };
     }
 
     async getTeacher(teacher_id) {
@@ -257,8 +300,8 @@ class InstitutionService extends Service {
         const results = [];
         for (let i in lbs_array) {
             let lbs = lbs_array[i];
-            const driving = drivings[i];
-            const walking = walkings[i];
+            const driving = drivings[i] ? drivings[i] : { distance: 0, duration: 0 };
+            const walking = walkings[i] ? walkings[i] : { distance: 0, duration: 0 };
             const lbs_distance = driving.distance > distance ? driving : walking;
             const travel_method = driving.distance > distance ? 'driving' : 'walking';
             results.push({
@@ -292,12 +335,15 @@ class InstitutionService extends Service {
             const lbs = institution_lbs[i];
 
             const area_name = institution_area.area_name;
-            const distance = lbs.distance ? lbs.distance : 10;
-            const duration = lbs.duration ? lbs.duration : 60;
+            const distance = lbs.distance;
+            const duration = lbs.duration;
             let travel_tips = `${area_name},距我${distance}km,开车${duration}分钟`;
             if (lbs.travel_method === 'walking') {
                 travel_tips = `${area_name},距我${distance}km,步行${duration}分钟`;
             }
+            if (distance === 0 && duration === 0) {
+                travel_tips = '暂无法计算出距离';
+            }
             // area.distance = distance;
             // area.duration = duration;
             // area.travel_tips = travel_tips;

app/service/course/lbs.js

@@ -94,6 +94,31 @@ class LbsService extends Service {
 
     return { result };
   }
+
+    // 地址解析
+    async getLBSAddress(address) {
+      const { ctx } = this;
+      let result = {};
+      const params = {
+        address,
+        key: ctx.app.config.TX_LBS_KEY,
+      };
+  
+      const resp = await ctx.helper.send_request(ctx.app.config.TX_LBS_ADDRESS_URL, params, { method: 'GET' });
+      // resp.data.status 状态码，0：正常，310：请求参数信息有误，311：Key格式错误，306：请求有护持信息请检查字符串，110：请求来源未被授权
+      ctx.logger.info('tx_lbs_address_resp: ' + JSON.stringify(resp));
+      if (resp.status === 200) {
+        // 判断响应是否正确
+        if (resp.data.status === 0) {
+          result = resp.data.result;
+        }
+      }
+  
+      return { result };
+    }
+
+
+
 }
 
 module.exports = LbsService;