add getBackColumns

app/controller/course/back.js

@@ -113,6 +113,15 @@ class BackController extends Controller {
 
     await service.course.back.exportUsedRedeemCode(queryParams);
   }
+
+
+  // 获取额外字段
+  async getBackColumns() {
+    const { ctx, service } = this;
+
+    const ret = await service.course.back.getBackColumns();
+    ctx.success(ret);
+  }
 }
 
 module.exports = BackController;

app/model/class/courseBackColumn.js

+'use strict';
+
+
+const moment = require('moment');
+
+module.exports = app => {
+  const { STRING, INTEGER, DATE } = app.Sequelize;
+
+  const CourseBackColumn = app.classModel.define('course_back_column', {
+    id: {
+      type: INTEGER,
+      primaryKey: true,
+      autoIncrement: true,
+    },
+    title: STRING,
+    column: STRING,
+    status: INTEGER,
+    created_time: {
+      type: DATE,
+      allowNull: true,
+      get() {
+        const date = this.getDataValue('created_time');
+        return date ? moment(date).format('YYYY-MM-DD HH:mm:ss') : undefined;
+      },
+    },
+    updated_time: {
+      type: DATE,
+      allowNull: true,
+      get() {
+        const date = this.getDataValue('updated_time');
+        return date ? moment(date).format('YYYY-MM-DD HH:mm:ss') : undefined;
+      },
+    },
+  }, {
+    timestamps: false,
+    tableName: 'course_back_column',
+  });
+
+  return CourseBackColumn;
+
+};

app/router/course.js

@@ -14,4 +14,5 @@ module.exports = app => {
   router.get('third', '/export/redeem', auth, 'course.back.exportRedeemCode');
   router.get('third', '/export/redeem/used', auth, 'course.back.exportUsedRedeemCode');
   router.get('third', '/redeem/used', auth, 'course.back.getUsedRedeemCodeList');
+  router.get('third', '/column/all', 'course.back.getBackColumns');
 };

app/service/course/back.js

@@ -88,7 +88,7 @@ class BackService extends Service {
       ctx.failed('用户异常');
     }
 
-    const filter = { where: { type: 1, status: 1, is_deleted: 0 }, limit, offset, attributes: [ 'id', 'order_no', 'class_id', 'pay', 'pay_time', 'address' ], order: [[ 'pay_time', 'desc' ]] };
+    const filter = { where: { type: 1, status: 1, is_deleted: 0 }, limit, offset, attributes: [ 'id', 'order_no', 'class_id', 'pay', 'pay_time', 'address', 'columns' ], order: [[ 'pay_time', 'desc' ]] };
     let filterClassIds = [];
     if (!ctx.isEmpty(input.class_name)) {
       const classList = await ctx.classModel.V5.CourseV5Class.findAll({ where: { name: { $like: `%${input.class_name}%` } }, attributes: [ 'id' ] });
@@ -139,6 +139,7 @@ class BackService extends Service {
         pay: v.pay,
         pay_time: v.pay_time,
         address: ctx.isEmpty(v.address) ? {} : JSON.parse(v.address),
+        columns: ctx.isEmpty(v.columns) ? {} : JSON.parse(v.columns),
       });
     }
 
@@ -513,6 +514,19 @@ class BackService extends Service {
     return true;
 
   }
+
+
+  // 获取额外字段
+  async getBackColumns() {
+    const { ctx } = this;
+
+    const columns = await ctx.classModel.CourseBackColumn.findAll({ where: { status: 1 }, attributes: [ 'title', 'column' ] });
+    const ret = {
+      list: columns,
+    };
+
+    return ret;
+  }
 }
 
 module.exports = BackService;

app/service/course/v5/user.js

@@ -366,7 +366,6 @@ class UserService extends Service {
     const { ctx } = this;
     const userUuid = ctx.userUuid;
     const id = input.id || 0;
-    const address = input.address || '';
     const columns = ctx.isEmpty(input.columns) ? {} : JSON.parse(input.columns);
 
     if (ctx.isEmpty(userUuid)) {
@@ -385,11 +384,14 @@ class UserService extends Service {
       ctx.failed('课程不存在');
     }
 
-    // // 获取用户地址
-    // const address = await ctx.classModel.V5.CourseUserAddress.findOne({ where: { user_uuid: ctx.userUuid, is_deleted: 0 }, attributes: [ 'province', 'city', 'area', 'address', 'name', 'phone' ], raw: true });
-    // if (ctx.isEmpty(address)) {
-    //   ctx.failed('地址不能为空');
-    // }
+    // 获取用户地址
+    let address = '';
+    if (classInfo.has_address === 1) {
+      address = await ctx.classModel.V5.CourseUserAddress.findOne({ where: { user_uuid: ctx.userUuid, is_deleted: 0 }, attributes: [ 'id', 'province', 'city', 'area', 'address', 'name', 'phone' ], raw: true });
+      if (ctx.isEmpty(address)) {
+        ctx.failed('地址不能为空');
+      }
+    }
 
     const orderNo = '11' + moment().format('YYYYMMDDHHMMSS') + await this.getRandomNumber(6);
     if (ctx.isEmpty(order)) {