Commit 04ff987f authored by 李尚科's avatar 李尚科

fix

parent eeb0a798
Pipeline #14089 passed with stage
in 38 seconds
...@@ -78,14 +78,16 @@ class InstitutionService extends Service { ...@@ -78,14 +78,16 @@ class InstitutionService extends Service {
const area = area_rows[i]; const area = area_rows[i];
const lbs = area_lbs[i]; const lbs = area_lbs[i];
const area_name = area.name; const area_name = area.name;
const distance = lbs.distance ? lbs.distance : 10; const distance = lbs.distance;
const duration = lbs.duration ? lbs.duration : 60; const duration = lbs.duration;
let travel_tips = `距我${distance}km,开车${duration}分钟`; let travel_tips = `距我${distance}km,开车${duration}分钟`;
if (lbs.travel_method === 'walking') { if (lbs.travel_method === 'walking') {
travel_tips = `距我${distance}km,步行${duration}分钟`; travel_tips = `距我${distance}km,步行${duration}分钟`;
} }
if (distance === 0 && duration === 0) {
travel_tips = '暂无法计算出距离';
}
areas.push({ areas.push({
id: area.id, id: area.id,
institution_id: area.institution_id, institution_id: area.institution_id,
...@@ -107,12 +109,12 @@ class InstitutionService extends Service { ...@@ -107,12 +109,12 @@ class InstitutionService extends Service {
institution_detail.address = current_area.address; institution_detail.address = current_area.address;
institution_detail.phone = current_area.phone; institution_detail.phone = current_area.phone;
institution_detail.description = institution.description; institution_detail.description = institution.description;
institution_detail.is_collect = false; institution_detail.is_collect = 0;
//是否收藏过 //是否收藏过
const collection_ret = await ctx.classModel.CourseUserCollection.one({ where: { user_uuid, institution_id, is_deleted: 0 } }); const collection_ret = await ctx.classModel.CourseUserCollection.one({ where: { user_uuid, institution_id, is_deleted: 0 } });
if (collection_ret && collection_ret.id) { if (collection_ret && collection_ret.id) {
institution_detail.is_collect = true; institution_detail.is_collect = 1;
} }
...@@ -296,8 +298,8 @@ class InstitutionService extends Service { ...@@ -296,8 +298,8 @@ class InstitutionService extends Service {
const results = []; const results = [];
for (let i in lbs_array) { for (let i in lbs_array) {
let lbs = lbs_array[i]; let lbs = lbs_array[i];
const driving = drivings[i]; const driving = drivings[i] ? drivings[i] : { distance: 0, duration: 0 };
const walking = walkings[i]; const walking = walkings[i] ? walkings[i] : { distance: 0, duration: 0 };
const lbs_distance = driving.distance > distance ? driving : walking; const lbs_distance = driving.distance > distance ? driving : walking;
const travel_method = driving.distance > distance ? 'driving' : 'walking'; const travel_method = driving.distance > distance ? 'driving' : 'walking';
results.push({ results.push({
...@@ -331,12 +333,15 @@ class InstitutionService extends Service { ...@@ -331,12 +333,15 @@ class InstitutionService extends Service {
const lbs = institution_lbs[i]; const lbs = institution_lbs[i];
const area_name = institution_area.area_name; const area_name = institution_area.area_name;
const distance = lbs.distance ? lbs.distance : 10; const distance = lbs.distance;
const duration = lbs.duration ? lbs.duration : 60; const duration = lbs.duration;
let travel_tips = `${area_name},距我${distance}km,开车${duration}分钟`; let travel_tips = `${area_name},距我${distance}km,开车${duration}分钟`;
if (lbs.travel_method === 'walking') { if (lbs.travel_method === 'walking') {
travel_tips = `${area_name},距我${distance}km,步行${duration}分钟`; travel_tips = `${area_name},距我${distance}km,步行${duration}分钟`;
} }
if (distance === 0 && duration === 0) {
travel_tips = '暂无法计算出距离';
}
// area.distance = distance; // area.distance = distance;
// area.duration = duration; // area.duration = duration;
// area.travel_tips = travel_tips; // area.travel_tips = travel_tips;
......
...@@ -94,6 +94,31 @@ class LbsService extends Service { ...@@ -94,6 +94,31 @@ class LbsService extends Service {
return { result }; 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; module.exports = LbsService;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment