✨ feat(活动): 微信公众号口令

shared/db/ActivityPublicAccountCode.ts

@@ -0,0 +1,49 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+
+
+/**
+  * 自助商店
+*/
+@index({ activityId: 1, channelId: 1 })
+
+export default class Activity_Public_Account_Code extends BaseModel {
+    @prop({ required: true })
+    activityId: number;				// 对应礼包码
+
+    @prop({ required: true })
+    channelId: string;				// 37平台id
+
+    @prop({ required: true })
+    serverId: number;				// 服
+
+    @prop({ required: true })
+    roleId: string;				    // 玩家id
+
+    @prop({ required: true })
+    orderId: string;             // 收到回调的订单号
+
+    @prop({ required: true })
+    hasReceived: boolean;           // 是否领取
+
+    public static async findByChannel(activityId: number, channelId: string) {
+        let result: ActivityPublicAccountCodeType = await ActivityPublicAccountCodeModel.findOne({ activityId, channelId }).lean();
+        return result;
+    }
+
+    public static async sendGift(activityId: number, channelId: string, serverId: number, roleId: string, orderId: string) {
+        let result: ActivityPublicAccountCodeType = await ActivityPublicAccountCodeModel.findOneAndUpdate({ activityId, channelId }, { $set: { serverId, roleId, orderId }, $setOnInsert: { hasReceived: false } }, { new: true, upsert: true }).lean();
+        return result;
+    } 
+
+    public static async receive(activityId: number, channelId: string) {
+        let result: ActivityPublicAccountCodeType = await ActivityPublicAccountCodeModel.findOneAndUpdate({ activityId, channelId, hasReceived: false }, { $set: { hasReceived: true  }}, { new: true }).lean();
+        return result;
+    }
+
+}
+
+export const ActivityPublicAccountCodeModel = getModelForClass(Activity_Public_Account_Code);
+
+export interface ActivityPublicAccountCodeType extends Pick<DocumentType<Activity_Public_Account_Code>, keyof Activity_Public_Account_Code> { }
+export type ActivityPublicAccountCodeTypeParam = Partial<ActivityPublicAccountCodeType>; // 将所有字段变成可选项

shared/db/GiftCode.ts

@@ -52,6 +52,9 @@ export default class GiftCode extends BaseModel {
     @prop({ required: true, default: 0 })
     usedNum: number;         // 使用次数
 
+    @prop({ required: true, default: 0 })
+    type: number;         // 0-游戏内领取 1-公众号口令活动领取 2-邮件领取
+
     @prop({ required: true, default: true })
     isEnable: boolean;         // 是否可以使用
 

shared/db/GiftCodeDetail.ts

@@ -16,6 +16,9 @@ class RoleRecord {
     @prop({ required: true, default: 0 })
     serverId: number;
 
+    @prop({ required: false, default: '' })
+    orderId?: string;
+
     @prop({ required: true, default: 0 })
     time: number;
 }
@@ -70,9 +73,9 @@ export default class GiftCodeDetail extends BaseModel {
         return result;
     }
 
-    public static async increaseUsedNum(code: string, roleId: string, roleName: string, serverId: number) {
+    public static async increaseUsedNum(code: string, roleId: string, roleName: string, serverId: number, orderId?: string) {
         let result: GiftCodeDetailType = await GiftCodeDetailModel.findOneAndUpdate({ code }, { 
-            $inc: { usedNum: 1 }, $push: { roleIds: roleId, record: { roleId, roleName, serverId, time: nowSeconds() } }
+            $inc: { usedNum: 1 }, $push: { roleIds: roleId, record: { roleId, roleName, serverId, time: nowSeconds(), orderId } }
         }, { new: true }).lean();
         return result;
     }

shared/db/User.ts

@@ -246,7 +246,7 @@ export default class User extends BaseModel {
   }
 
   public static async findUserByChannel(channelId: string) {
-    const user: UserType = await UserModel.findOne({ channelId }).select('uid token serverType auth tel userCode pkgName ip deviceId').lean({ getters: true });
+    const user: UserType = await UserModel.findOne({ channelId }).select('uid token serverType auth tel userCode pkgName ip deviceId channelId').lean({ getters: true });
     return user;
   }