update

app/controller/.policy.js

@@ -44,6 +44,7 @@ module.exports = {
         company: "company",
         type: "type",
         phone: "phone",
+        status: "status",
         "create_time@start": "create_time@start",
         "create_time@end": "create_time@end",
       },

app/controller/.ticket.js

@@ -0,0 +1,50 @@
+module.exports = {
+  create: {
+    requestBody: ["user_id", "material", "medium_material", "contract"],
+  },
+  destroy: {
+    params: ["!id"],
+    service: "delete",
+  },
+  update: {
+    params: ["!id"],
+    requestBody: [
+      "user_id",
+      "material",
+      "medium_material",
+      "contract",
+      "status",
+    ],
+  },
+  show: {
+    parameters: {
+      params: ["!id"],
+    },
+    service: "fetch",
+  },
+  index: {
+    parameters: {
+      query: {
+        name: "name",
+        user_id: "user_id",
+        status: "status",
+        "create_time@start": "create_time@start",
+        "create_time@end": "create_time@end",
+      },
+      // options: {
+      //   "meta.state": 0 // 默认条件
+      // },
+    },
+    service: "query",
+    options: {
+      query: ["skip", "limit"],
+      sort: ["meta.createdAt"],
+      desc: true,
+      count: true,
+    },
+  },
+  status: {
+    params: ["!id"],
+    requestBody: ["status", "desc", "opera_id"],
+  },
+};

app/controller/.ticket_record.js

@@ -0,0 +1,39 @@
+module.exports = {
+  create: {
+    requestBody: ["ticket_id", "status", "desc", "opera_id"],
+  },
+  destroy: {
+    params: ["!id"],
+    service: "delete",
+  },
+  update: {
+    params: ["!id"],
+    requestBody: ["ticket_id", "status", "desc", "opera_id"],
+  },
+  show: {
+    parameters: {
+      params: ["!id"],
+    },
+    service: "fetch",
+  },
+  index: {
+    parameters: {
+      query: {
+        ticket_id: "ticket_id",
+        status: "status",
+        "create_time@start": "create_time@start",
+        "create_time@end": "create_time@end",
+      },
+      // options: {
+      //   "meta.state": 0 // 默认条件
+      // },
+    },
+    service: "query",
+    options: {
+      query: ["skip", "limit"],
+      sort: ["meta.createdAt"],
+      desc: true,
+      count: true,
+    },
+  },
+};

app/controller/ticket.js

@@ -0,0 +1,17 @@
+'use strict';
+const meta = require('./.ticket.js');
+const Controller = require('egg').Controller;
+const { CrudController } = require('naf-framework-mongoose/lib/controller');
+
+// 创新券
+class TicketController extends Controller {
+  constructor(ctx) {
+    super(ctx);
+    this.service = this.ctx.service.ticket;
+  }
+  async index() {
+    const { data, total } = await this.service.query(this.ctx.query);
+    this.ctx.ok({ data, total });
+  }
+}
+module.exports = CrudController(TicketController, meta);

app/controller/ticket_record.js

@@ -0,0 +1,13 @@
+'use strict';
+const meta = require('./.ticket_record.js');
+const Controller = require('egg').Controller;
+const { CrudController } = require('naf-framework-mongoose/lib/controller');
+
+// 创新券记录表
+class Ticket_recordController extends Controller {
+  constructor(ctx) {
+    super(ctx);
+    this.service = this.ctx.service.ticketRecord;
+  }
+}
+module.exports = CrudController(Ticket_recordController, meta);

app/model/ticket.js

@@ -0,0 +1,29 @@
+'use strict';
+const Schema = require('mongoose').Schema;
+const moment = require('moment');
+const metaPlugin = require('naf-framework-mongoose/lib/model/meta-plugin');
+const { ObjectId } = require('mongoose').Types;
+// 创新劵表
+const ticket = {
+  user_id: { type: ObjectId }, // 用户id
+  material: { type: Array }, // 审核资料
+  medium_material: { type: Array }, // 中介机构审核资料
+  contract: { type: Array }, // 合同
+  status: { type: String, default: '0' },
+  // 0-资质审核;
+  // 1-准备订单;-1-资质审核失败;
+  // 2-订单入库(中介机构,企业上传合同); -2 - 中介审核失败(重填信息)
+  // 3-创新劵领取成功(服务机构审核成功)
+  remark: { type: String },
+  create_time: { type: String, default: moment(new Date()).format('YYYY-MM-DD HH:mm:ss') },
+};
+const schema = new Schema(ticket, { toJSON: { virtuals: true } });
+schema.index({ id: 1 });
+schema.index({ status: 1 });
+schema.index({ user_id: 1 });
+schema.index({ 'meta.createdAt': 1 });
+schema.plugin(metaPlugin);
+module.exports = app => {
+  const { mongoose } = app;
+  return mongoose.model('Ticket', schema, 'ticket');
+};

app/model/ticket_record.js

@@ -0,0 +1,24 @@
+'use strict';
+const Schema = require('mongoose').Schema;
+const moment = require('moment');
+const metaPlugin = require('naf-framework-mongoose/lib/model/meta-plugin');
+const { ObjectId } = require('mongoose').Types;
+// 创新劵审核记录表
+const ticket_record = {
+  ticket_id: { type: ObjectId },
+  opera_id: { type: ObjectId }, // 审核人
+  status: { type: String }, // 改变为的状态
+  desc: { type: String }, // 建议
+  remark: { type: String },
+  create_time: { type: String, default: moment(new Date()).format('YYYY-MM-DD HH:mm:ss') },
+};
+const schema = new Schema(ticket_record, { toJSON: { virtuals: true } });
+schema.index({ id: 1 });
+schema.index({ ticket_id: 1 });
+schema.index({ status: 1 });
+schema.index({ 'meta.createdAt': 1 });
+schema.plugin(metaPlugin);
+module.exports = app => {
+  const { mongoose } = app;
+  return mongoose.model('Ticket_record', schema, 'ticket_record');
+};

app/router.js

@@ -18,4 +18,6 @@ module.exports = app => {
   require('./router/online')(app); // 在线
   require('./router/code')(app); // 字典表
   require('./router/policy')(app); // 高企服务
+  require('./router/ticket')(app); // 创新券
+  require('./router/ticket_record')(app); // 创新券
 };

app/router/ticket.js

@@ -0,0 +1,10 @@
+'use strict';
+
+
+module.exports = app => {
+  const { router, controller } = app;
+  const prefix = 'ticket';
+  router.post(prefix, `/${prefix}/status/:id`, controller[prefix].status);
+  router.resources(prefix, `/${prefix}`, controller[prefix]); // index、create、show、destroy
+  router.post(prefix, `/${prefix}/update/:id`, controller[prefix].update);
+};

app/router/ticket_record.js

@@ -0,0 +1,9 @@
+'use strict';
+
+
+module.exports = app => {
+  const { router, controller } = app;
+  const prefix = 'ticketRecord';
+  router.resources(prefix, `/${prefix}`, controller[prefix]); // index、create、show、destroy
+  router.post(prefix, `/${prefix}/update/:id`, controller[prefix].update);
+};

app/service/organization.js

@@ -39,7 +39,6 @@ class OrganizationService extends CrudService {
    * @property passwd 密码
    */
   async login({ institution_code, passwd }) {
-    console.log(institution_code, passwd);
     const object = await this.model.findOne({ institution_code, isdel: '0' }, '+passwd');
     if (!object) throw new BusinessError(ErrorCode.DATA_NOT_EXIST, '未找到用户的信息');
     const { passwd: op, status } = object;

app/service/ticket.js

@@ -0,0 +1,63 @@
+'use strict';
+const { CrudService } = require('naf-framework-mongoose/lib/service');
+const { BusinessError, ErrorCode } = require('naf-core').Error;
+const _ = require('lodash');
+const assert = require('assert');
+
+// 超市
+class TicketService extends CrudService {
+  constructor(ctx) {
+    super(ctx, 'ticket');
+    this.model = this.ctx.model.Ticket;
+    this.record = this.ctx.model.TicketRecord;
+  }
+
+  async query({ skip = 0, limit = 0, ...query } = {}) {
+    const nquery = _.omit(query, [ 'name' ]);
+    const arr = [
+      { $match: nquery },
+      {
+        $lookup: {
+          from: 'organization',
+          localField: 'user_id',
+          foreignField: '_id',
+          as: 'company',
+        },
+      },
+      { $unwind: '$company' },
+      { $addFields: { name: '$company.name' } },
+      { $project: { _id: 1, name: 1, meta: 1, status: 1 } },
+    ];
+    if (_.get(query, 'name')) {
+      arr.push({ $match: { name: new RegExp(_.get(query, 'name')) } });
+    }
+    let res = await this.model.aggregate(arr);
+    const total = res.length;
+    if (limit && limit !== '0') {
+      res = _.slice(res, parseInt(skip), parseInt(limit));
+    }
+    return { data: res, total };
+  }
+
+  async fetch({ id }) {
+    let res = await this.model.findById(id);
+    if (!res) throw new BusinessError(ErrorCode.DATA_NOT_EXIST, '未找到指定数据');
+    res = JSON.parse(JSON.stringify(res));
+    const { user_id } = res;
+    if (user_id) {
+      const company = await this.ctx.model.Organization.findById(user_id);
+      if (company) res.name = company.name;
+    }
+    return res;
+  }
+
+  async status({ id }, body) {
+    const { status } = body;
+    await this.model.updateOne({ _id: id }, { status });
+    // TODO,添加记录
+    body.ticket_id = id;
+    await this.record.create(body);
+  }
+}
+
+module.exports = TicketService;

app/service/ticket_record.js

@@ -0,0 +1,15 @@
+'use strict';
+const { CrudService } = require('naf-framework-mongoose/lib/service');
+const { BusinessError, ErrorCode } = require('naf-core').Error;
+const _ = require('lodash');
+const assert = require('assert');
+
+//
+class Ticket_recordService extends CrudService {
+  constructor(ctx) {
+    super(ctx, 'ticket_record');
+    this.model = this.ctx.model.TicketRecord;
+  }
+}
+
+module.exports = Ticket_recordService;