update

app/controller/group/config/.group.js

@@ -1,50 +0,0 @@
-module.exports = {
-  create: {
-    requestBody: ['person_limit', 'shop', 'goods', 'goodsSpec', 'leader', 'persons', 'status'],
-  },
-  destroy: {
-    params: ['!id'],
-    service: 'delete',
-  },
-  update: {
-    params: ['!id'],
-    requestBody: ['person_limit', 'shop', 'goods', 'goodsSpec', 'leader', 'persons', 'status'],
-  },
-  show: {
-    parameters: {
-      params: ['!id'],
-    },
-    service: 'fetch',
-  },
-  index: {
-    parameters: {
-      query: {
-        'meta.createdAt@start': 'meta.createdAt@start',
-        'meta.createdAt@end': 'meta.createdAt@end',
-        shop: 'shop',
-        goods: 'goods._id',
-        goodsSpec: 'goodsSpec._id',
-        person: 'persons.customer',
-        leader: 'leader',
-        status: 'status',
-      },
-      // options: {
-      //   'persons.status': '0', // 默认条件
-      // },
-    },
-    service: 'query',
-    options: {
-      query: ['skip', 'limit'],
-      sort: ['meta.createdAt'],
-      desc: true,
-      count: true,
-    },
-  },
-  getGroup: {
-    parameters: {
-      query: {
-        order_id: 'order_id',
-      },
-    },
-  },
-};

app/controller/group/group.js

@@ -1,13 +0,0 @@
-'use strict';
-const meta = require('./config/.group.js');
-const Controller = require('egg').Controller;
-const { CrudController } = require('naf-framework-mongoose-free/lib/controller');
-
-// 
-class GroupController extends Controller {
-  constructor(ctx) {
-    super(ctx);
-    this.service = this.ctx.service.group.group;
-  }
-}
-module.exports = CrudController(GroupController, meta);

app/controller/shop/config/.goodsSpec.js

@@ -1,6 +1,6 @@
 module.exports = {
   create: {
-    requestBody: ['leader_price', 'sort', 'file', 'can_group', 'group_config', 'sell_money', 'flow_money', 'freight', 'goods', 'name', 'num', 'status'],
+    requestBody: ['buy_limit', 'limit_num', 'leader_price', 'sort', 'file', 'can_group', 'group_config', 'sell_money', 'flow_money', 'freight', 'goods', 'name', 'num', 'status'],
   },
   destroy: {
     params: ['!id'],
@@ -8,7 +8,7 @@ module.exports = {
   },
   update: {
     params: ['!id'],
-    requestBody: ['leader_price', 'sort', 'file', 'can_group', 'group_config', 'sell_money', 'flow_money', 'freight', 'goods', 'name', 'num', 'status'],
+    requestBody: ['buy_limit', 'limit_num', 'leader_price', 'sort', 'file', 'can_group', 'group_config', 'sell_money', 'flow_money', 'freight', 'goods', 'name', 'num', 'status'],
   },
   show: {
     parameters: {
@@ -26,6 +26,7 @@ module.exports = {
         status: 'status',
         can_group: 'can_group',
         sort: 'sort',
+        buy_limit: 'buy_limit',
       },
       // options: {
       //   "meta.state": 0 // 默认条件

app/model/group/group.js

@@ -1,34 +0,0 @@
-'use strict';
-const Schema = require('mongoose').Schema;
-const metaPlugin = require('naf-framework-mongoose-free/lib/model/meta-plugin');
-const persons = [{
-  customer: '用户',
-  status: '状态', // 0:入团;1:退团
-  join_time: '入团时间',
-  out_time: '退团时间',
-}];
-// 团表
-const group = {
-  shop: { type: String, required: false, zh: '店铺', ref: 'Shop.Shop' }, //
-  goods: { type: Object, required: false, zh: '商品' }, //
-  goodsSpec: { type: Object, required: false, zh: '规格' }, //
-  leader: { type: String, required: false, zh: '团长', ref: 'User.User' }, //
-  persons: { type: Array, required: false, zh: '团员' }, //
-  status: { type: String, required: false, default: '0', zh: '状态' }, // 字典:group_status
-  person_limit: { type: Number, required: false, zh: '人数限制' }, //
-};
-const schema = new Schema(group, { toJSON: { getters: true, virtuals: true } });
-schema.index({ id: 1 });
-schema.index({ 'meta.createdAt': 1 });
-schema.index({ shop: 1 });
-schema.index({ goods: 1 });
-schema.index({ goodsSpec: 1 });
-schema.index({ leader: 1 });
-schema.index({ status: 1 });
-
-schema.plugin(metaPlugin);
-
-module.exports = app => {
-  const { mongoose } = app;
-  return mongoose.model('Group', schema, 'group');
-};

app/model/shop/goodsSpec.js

@@ -9,19 +9,19 @@ const goodsSpec = {
   goods: { type: String, required: false, zh: '商品源', ref: 'Shop.Goods' }, //
   name: { type: String, required: false, zh: '规格名称' }, //
   num: { type: Number, required: false, zh: '库存' }, //
-  status: { type: String, required: false, default: '0', zh: '状态' }, // 字典status
-  can_group: { type: String, required: false, zh: '是否可以团购' }, // 字典:tf
-  group_config: { type: Object, required: false, zh: '团购设置' }, // 团购模块的设置:团购金额:money,需要人数:need_person
+  buy_limit: { type: String, required: false, default: '0', zh: '购买限制' }, // 字典表:buy_limit
+  limit_num: { type: Number, required: false, zh: '限制数量界限' }, //
+  status: { type: String, required: false, default: '0', zh: '状态' }, // 字典:use
   file: { type: Array, required: false, zh: '图片' }, //
-  sort: { type: Number, required: false, default: 0, zh: '排序' }, //
+  sort: { type: Number, required: false, default: '0', zh: '排序' }, //
 };
 const schema = new Schema(goodsSpec, { toJSON: { getters: true, virtuals: true } });
 schema.index({ id: 1 });
 schema.index({ 'meta.createdAt': 1 });
 schema.index({ goods: 1 });
 schema.index({ name: 1 });
+schema.index({ buy_limit: 1 });
 schema.index({ status: 1 });
-schema.index({ can_group: 1 });
 schema.index({ sort: 1 });
 
 schema.plugin(metaPlugin);

app/router.js

@@ -12,7 +12,6 @@ module.exports = app => {
   require('./z_router/system/index')(app); // 系统部分
   require('./z_router/shop/index')(app); // 店铺部分
   require('./z_router/trade/index')(app); // 交易部分
-  require('./z_router/group/index')(app); // 团购部分
 
   require('./z_router/view/index')(app); // 视图部分
   require('./z_router/util')(app); // 工具接口

app/z_router/group/group.js

@@ -1,20 +0,0 @@
-'use strict';
-// 路由配置
-const path = require('path');
-const regPath = path.resolve('app', 'public', 'routerRegister');
-const routerRegister = require(regPath);
-const rkey = 'group';
-const ckey = 'group.group';
-const keyZh = '团';
-const routes = [
-  { method: 'get', path: `${rkey}/getGroup`, controller: `${ckey}.getGroup`, name: `${ckey}getGroup`, zh: `${keyZh}获取订单信息` },
-  { method: 'get', path: `${rkey}`, controller: `${ckey}.index`, name: `${ckey}Query`, zh: `${keyZh}列表查询` },
-  { method: 'get', path: `${rkey}/:id`, controller: `${ckey}.show`, name: `${ckey}Show`, zh: `${keyZh}查询` },
-  // { method: 'post', path: `${rkey}`, controller: `${ckey}.create`, name: `${ckey}Create`, zh: `创建${keyZh}` },
-  { method: 'post', path: `${rkey}/:id`, controller: `${ckey}.update`, name: `${ckey}Update`, zh: `修改${keyZh}` },
-  // { method: 'delete', path: `${rkey}/:id`, controller: `${ckey}.destroy`, name: `${ckey}Delete`, zh: `删除${keyZh}` },
-];
-
-module.exports = app => {
-  routerRegister(app, routes, keyZh, rkey, ckey);
-};

app/z_router/group/index.js

@@ -1,6 +0,0 @@
-/**
- * @param {Egg.Application} app - egg application
- */
-module.exports = app => {
-  require('./group')(app); // 团
-};