lrf 2 yıl önce
ebeveyn
işleme
7d99e572d4

+ 1 - 1
app/model/race/matchGroup.js

@@ -5,7 +5,7 @@ const source = 'race';
 
 // 赛事组别
 const match_group = {
-  match_id: { type: String, required: true, zh: '赛事id', ref: 'match', getProp: [ 'name' ] }, // 比赛信息中的比赛名称
+  match_id: { type: String, required: true, zh: '赛事id', ref: 'Match', getProp: [ 'name' ] }, // 比赛信息中的比赛名称
   name: { type: String, required: true, zh: '名称' }, //
   age: { type: String, required: false, zh: '年龄限制' }, //
   explain: { type: String, required: false, zh: '说明' }, //

+ 2 - 2
app/model/race/matchProject.js

@@ -4,8 +4,8 @@ const metaPlugin = require('naf-framework-mongoose-free/lib/model/meta-plugin');
 
 // 组别项目
 const match_project = {
-  match_id: { type: String, required: true, zh: '赛事id', ref: 'match', getProp: [ 'name' ] }, // 比赛信息中的比赛名称
-  group_id: { type: String, required: true, zh: '赛事分组id', ref: 'match_group', getProp: [ 'name' ] }, // 赛事分组中的组名称
+  match_id: { type: String, required: true, zh: '赛事id', ref: 'Match', getProp: [ 'name' ] }, // 比赛信息中的比赛名称
+  group_id: { type: String, required: true, zh: '赛事分组id', ref: 'MatchGroup', getProp: [ 'name' ] }, // 赛事分组中的组名称
   type: { type: String, required: true, zh: '项目类别' }, // 字典表中的标签
   name: { type: String, required: true, zh: '名称' }, //
   age: { type: String, required: false, zh: '年龄限制' }, //

+ 4 - 4
app/model/race/matchSign.js

@@ -4,13 +4,13 @@ const metaPlugin = require('naf-framework-mongoose-free/lib/model/meta-plugin');
 
 // 赛事报名
 const match_sign = {
-  match_id: { type: String, required: true, zh: '赛事id', ref: 'match', getProp: [ 'name' ] }, // 比赛信息中的名称
-  group_id: { type: String, required: true, zh: '组别id', ref: 'match_group', getProp: [ 'name' ] }, // 赛事组别中的名称
-  project_id: { type: String, required: true, zh: '项目id', ref: 'match_project', getProp: [ 'name' ] }, // 组别项目中的名称
+  match_id: { type: String, required: true, zh: '赛事id', ref: 'Match', getProp: [ 'name' ] }, // 比赛信息中的名称
+  group_id: { type: String, required: true, zh: '组别id', ref: 'MatchGroup', getProp: [ 'name' ] }, // 赛事组别中的名称
+  project_id: { type: String, required: true, zh: '项目id', ref: 'MatchGroup', getProp: [ 'name' ] }, // 组别项目中的名称
   user_id: { type: String, required: true, zh: '用户id' }, //
   is_share: { type: Boolean, required: false, zh: '是否转发' }, //
   pay_id: { type: String, required: false, zh: '账单id' }, //
-  pay_status: { type: String, required: false, zh: '账单状态' }, //
+  pay_status: { type: String, required: false, zh: '账单状态', default: '0' }, // 0:未支付;1支付成功;-1:支付失败;-2:申请退款(退赛)
 };
 const schema = new Schema(match_sign, { toJSON: { getters: true, virtuals: true } });
 schema.index({ id: 1 });

+ 3 - 3
app/model/race/teamApply.js

@@ -4,9 +4,9 @@ const metaPlugin = require('naf-framework-mongoose-free/lib/model/meta-plugin');
 
 // 组队申请
 const team_apply = {
-  match_id: { type: String, required: true, zh: '赛事id', ref: 'match', getProp: [ 'name' ] }, // 比赛信息表中的名称
-  group_id: { type: String, required: true, zh: '组别id', ref: 'match_group', getProp: [ 'name' ] }, // 赛事组别中的名称
-  project_id: { type: String, required: true, zh: '项目id', ref: 'match_project', getProp: [ 'name' ] }, // 组别项目中的名称
+  match_id: { type: String, required: true, zh: '赛事id', ref: 'Match', getProp: [ 'name' ] }, // 比赛信息表中的名称
+  group_id: { type: String, required: true, zh: '组别id', ref: 'MatchGroup', getProp: [ 'name' ] }, // 赛事组别中的名称
+  project_id: { type: String, required: true, zh: '项目id', ref: 'MatchProject', getProp: [ 'name' ] }, // 组别项目中的名称
   one_member_id: { type: String, required: true, zh: '成员一id' }, //
   one_member_name: { type: String, required: true, zh: '成员一姓名' }, //
   two_member_id: { type: String, required: true, zh: '成员二id' }, //