diff --git a/shared/db/GiftCode.ts b/shared/db/GiftCode.ts index b74301006..e4dc38360 100644 --- a/shared/db/GiftCode.ts +++ b/shared/db/GiftCode.ts @@ -34,6 +34,9 @@ export default class GiftCode extends BaseModel { @prop({ required: true, default: 0 }) codeLen: number; // 礼包码位数 + @prop({ required: false, default: '' }) + code: string; // 指定礼包码 + @prop({ required: true, default: '' }) remark: string; // 备注 diff --git a/shared/db/GiftCodeDetail.ts b/shared/db/GiftCodeDetail.ts index 05f4e2cec..911e9198f 100644 --- a/shared/db/GiftCodeDetail.ts +++ b/shared/db/GiftCodeDetail.ts @@ -82,7 +82,7 @@ export default class GiftCodeDetail extends BaseModel { for(let i = 0; i < count; i++) { insertArr.push({ giftId: giftCode.id, giftName: giftCode.name, generateType: giftCode.generateType, - code: genCode(giftCode.codeLen), usedNum: 0, createdBy: uid, updatedBy: uid + code: giftCode.code||genCode(giftCode.codeLen), usedNum: 0, createdBy: uid, updatedBy: uid }); } let result = await GiftCodeDetailModel.insertMany(insertArr); diff --git a/shared/domain/backEndField/params.ts b/shared/domain/backEndField/params.ts index a065fb244..6fcc203eb 100644 --- a/shared/domain/backEndField/params.ts +++ b/shared/domain/backEndField/params.ts @@ -168,6 +168,7 @@ export class CreateGiftCode { codeLen: number; // 礼包码位数 remark: string = ''; // 备注 generateType: GIFT_GENERATE_TYPE; // 生成类型 + code: string = ''; constructor(obj: any) { this.name = obj.name; @@ -177,6 +178,7 @@ export class CreateGiftCode { this.codeLen = obj.codeLen; this.remark = obj.remark; this.generateType = obj.generateType; + this.code = obj.code; } checkParams() { @@ -191,6 +193,7 @@ export class CreateGiftCode { if(this.generateType != GIFT_GENERATE_TYPE.ONE_TO_MANY && this.generateType != GIFT_GENERATE_TYPE.ONE_TO_ONE) { return false } + if(this.code != undefined && !isString(this.code)) return false return true; } }