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

app/controller/course/v1/user.js

@@ -18,10 +18,10 @@ class UserController extends Controller {
         const openid = wx_auth_ret.openid;//获取openid
 
         //检查是否已授权过 是否已入用户表
-        let user = await ctx.classModel.v1.CourseUser.one({ where: { openid, is_deleted: 0 } });
+        let user = await ctx.classModel.V1.CourseUser.one({ where: { openid, is_deleted: 0 } });
         if (!user || !user.uuid) {
             const uuid = uuidv4();
-            user = await ctx.classModel.v1.CourseUser.create({ uuid, openid });
+            user = await ctx.classModel.V1.CourseUser.create({ uuid, openid });
             // user.uuid = uuid;
         }
         console.info(user);
@@ -47,8 +47,8 @@ class UserController extends Controller {
         const { avatar, nickname, province, country, sex, city } = input_params;
 
         //查找用户是否存在并更新
-        const user = ctx.classModel.v1.CourseUser.one({ where: { uuid } });
-        await ctx.classModel.v1.CourseUser.edit({ params: { avatar, nickname, sex }, where: { uuid } });
+        const user = ctx.classModel.V1.CourseUser.one({ where: { uuid } });
+        await ctx.classModel.V1.CourseUser.edit({ params: { avatar, nickname, sex }, where: { uuid } });
         let bindphone = 0;
         if (user.phone) {
             bindphone = 1;

app/model/class/course_user.js

@@ -23,19 +23,19 @@ module.exports = app => {
     sex: STRING,
     openid: STRING,
     is_deleted: INTEGER,
-    created_time: {
+    created_at: {
       type: DATE,
       allowNull: true,
       get() {
-        const date = this.getDataValue('created_time');
+        const date = this.getDataValue('created_at');
         return date ? moment(date).format('YYYY-MM-DD HH:mm:ss') : undefined;
       },
     },
-    updated_time: {
+    updated_at: {
       type: DATE,
       allowNull: true,
       get() {
-        const date = this.getDataValue('updated_time');
+        const date = this.getDataValue('updated_at');
         return date ? moment(date).format('YYYY-MM-DD HH:mm:ss') : undefined;
       },
     },

app/model/class/v1/course_institution.js

@@ -7,7 +7,7 @@ module.exports = app => {
   const { STRING, INTEGER, DATE, DECIMAL, TEXT, ENUM } = app.Sequelize;
 
 
-  const CourseArea = app.classModel.define('course_area');
+  const CourseArea = app.classModel.define('course_area_v1');
 
   const CourseInstitution = app.classModel.define('course_institution_v1', {
     id: {

app/model/class/v1/course_user.js

@@ -23,19 +23,19 @@ module.exports = app => {
     sex: STRING,
     openid: STRING,
     is_deleted: INTEGER,
-    created_time: {
+    created_at: {
       type: DATE,
       allowNull: true,
       get() {
-        const date = this.getDataValue('created_time');
+        const date = this.getDataValue('created_at');
         return date ? moment(date).format('YYYY-MM-DD HH:mm:ss') : undefined;
       },
     },
-    updated_time: {
+    updated_at: {
       type: DATE,
       allowNull: true,
       get() {
-        const date = this.getDataValue('updated_time');
+        const date = this.getDataValue('updated_at');
         return date ? moment(date).format('YYYY-MM-DD HH:mm:ss') : undefined;
       },
     },

app/service/course/v1/institution.js

@@ -56,7 +56,6 @@ class InstitutionService extends Service {
     // const area_lbs = await this.computeDistance(institution_area_list, { lat, lng });// 计算距离信息
     const area_distance_list = await this.calcDistance(institution_area_list, { lat, lng }, page, distance);
     const area_distance = area_distance_list.rows;
-    console.log(area_distance_list);
     const institution_areas = await this.computeDistance(area_distance, { lat, lng });
     for (const i in institution_areas) {
       area_distance[i].distance = Number(institution_areas[i].distance) === 0 ? 999999999.0 : parseFloat(institution_areas[i].distance);
@@ -307,7 +306,6 @@ class InstitutionService extends Service {
 
   // 机构列表 并有多校区 {id：1，..., course_areas:[{},{}]
   async getInstitutionAreaList(institutions) {
-
     const { ctx } = this;
 
     if (!Array.isArray(institutions) || institutions.length === 0) {
@@ -317,8 +315,8 @@ class InstitutionService extends Service {
     const ret = [];
     for (const i in institutions) {
       const institution = institutions[i];
-      if (!institution.course_areas || institution.course_areas.length === 0) continue;
-      const course_areas = institution.course_areas;
+      if (!institution.course_area_v1s || institution.course_area_v1s.length === 0) continue;
+      const course_areas = institution.course_area_v1s;
       for (const j in course_areas) {
         const course_area = course_areas[j];
         ret.push({

app/service/course/v1/user.js

@@ -118,8 +118,8 @@ class UserService extends Service {
   async requestWxAuth(code) {
 
     const { ctx } = this;
-    const APPID = 'wx4769ebba9b91f8ec';
-    const SECRET = '680440637b4e38c9b66529cfd5dc590e';
+    const APPID = 'wx07a5f0ed5bdf4751';
+    const SECRET = 'a1b2d32b018988176181497bd74a0b7d';
     const url = `https://api.weixin.qq.com/sns/jscode2session?appid=${APPID}&secret=${SECRET}&js_code=${code}&grant_type=authorization_code`;
 
     const result = await ctx.helper.send_request(url, {}, { method: 'GET' });