add back_column

app/model/class/v5/courseV5Institution.js

@@ -18,6 +18,7 @@ module.exports = app => {
     description: TEXT,
     title: STRING,
     pay_column: STRING,
+    back_column: STRING,
     status: INTEGER,
     is_deleted: INTEGER,
     created_time: {

app/router/course.js

@@ -14,5 +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');
+  router.get('third', '/column/all', auth, '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', 'columns' ], 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', 'redeem', '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' ] });
@@ -138,6 +138,7 @@ class BackService extends Service {
         class_name: ctx.isEmpty(classList[v.class_id]) ? '' : classList[v.class_id][0].name,
         pay: v.pay,
         pay_time: v.pay_time,
+        redeem_code: v.redeem,
         address: ctx.isEmpty(v.address) ? {} : JSON.parse(v.address),
         columns: ctx.isEmpty(v.columns) ? {} : JSON.parse(v.columns),
       });
@@ -519,8 +520,21 @@ class BackService extends Service {
   // 获取额外字段
   async getBackColumns() {
     const { ctx } = this;
+    const userUuid = ctx.userUuid;
 
-    const columns = await ctx.classModel.CourseBackColumn.findAll({ where: { status: 1 }, attributes: [ 'title', 'column' ] });
+    const userInfo = await ctx.classModel.CourseBackUser.findOne({ where: { id: userUuid, is_deleted: 0 } });
+    if (ctx.isEmpty(userInfo)) {
+      ctx.failed('无效用户');
+    }
+
+    let columns = [];
+    if (userInfo.is_admin > 0) {
+      columns = await ctx.classModel.CourseBackColumn.findAll({ where: { status: 1 }, attributes: [ 'title', 'column' ] });
+    } else {
+      columns = await ctx.classModel.V5.CourseV5Institution.findOne({ where: { id: userInfo.institution_id }, attributes: [ 'back_column' ] });
+      columns = (ctx.isEmpty(columns) || ctx.isEmpty(columns.back_column)) ? [] : eval(columns.back_column);
+      columns = await ctx.classModel.CourseBackColumn.findAll({ where: { column: { $in: columns }, status: 1 }, attributes: [ 'title', 'column' ] });
+    }
     const ret = {
       list: columns,
     };