活动：糜家商队

shared/db/ActivitySelfService.ts

@@ -0,0 +1,62 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+
+
+
+export class ChallengeRecord {
+    @prop({ required: true })
+    count: number;		//挑战次数
+    @prop({ required: true })
+    time: Date;				// 开始统计时间
+}
+/**
+  * 糜家商队活动数据
+*/
+@index({ roleId: 1 })
+
+export default class Activity_Self_Service extends BaseModel {
+    @prop({ required: true })
+    serverId: number;				// 服
+    @prop({ required: true })
+    activityId: number;				// 活动Id
+    @prop({ required: true })
+    roundIndex: number;				// 活动第几周期 从1开始，根据活动开始时间计算    
+    @prop({ required: true })
+    roleId: string;			        // 用户Id
+    @prop({ required: true })
+    unitBuyCount: number;			// 购买代币次数
+    @prop({ required: true })
+    challengeRecords: ChallengeRecord[];	    //挑战记录
+
+
+    //添加购买代币记录
+    public static async addBuyRecord(serverId: number, activityId: number, roleId: string, roundIndex: number, count: number) {
+        let result: ActivitySelfServiceModelType = await ActivitySelfServiceModel.findOneAndUpdate(
+            { serverId, roleId, activityId, roundIndex }, { $inc: { unitBuyCount: count } }, { upsert: true, new: true }).lean(true);
+        return result;
+    }
+
+    //添加挑战记录
+    public static async addChallengeRecord(serverId: number, activityId: number, roleId: string, roundIndex: number, count: number, time: Date) {
+        let result: ActivitySelfServiceModelType = await ActivitySelfServiceModel.findOneAndUpdate(
+            { serverId, roleId, activityId, roundIndex, challengeRecords: { $elemMatch: { time } } },
+            { $inc: { "challengeRecords.$.count": count } }, { upsert: true, new: true }).lean(true);
+        return result;
+    }
+
+    //查询活动数据
+    public static async findData(serverId: number, activityId: number, roleId: string, roundIndex: number) {
+        let result: ActivitySelfServiceModelType = await ActivitySelfServiceModel.findOne({ serverId, roleId, activityId, roundIndex }).lean(true);
+        return result;
+    }
+
+    //删除活动领取记录
+    public static async deleteActivity(serverId: number, activityId: number, roleId: string, roundIndex: number, index: number,) {
+        await ActivitySelfServiceModel.deleteMany({ serverId, roleId, activityId, index, roundIndex });
+    }
+}
+
+export const ActivitySelfServiceModel = getModelForClass(Activity_Self_Service);
+
+export interface ActivitySelfServiceModelType extends Pick<DocumentType<Activity_Self_Service>, keyof Activity_Self_Service> { }
+export type ActivitySelfServiceModelTypeParam = Partial<ActivitySelfServiceModelType>; // 将所有字段变成可选项

shared/db/ActivitySelfServiceShop.ts

@@ -19,16 +19,12 @@ export default class Activity_Self_Service_Shop extends BaseModel {
     @prop({ required: true })
     index: number;				    // 第几个货架从1开始
     @prop({ required: true })
-    price: number;					//购买价格
-    @prop({ required: true })
-    priceType: number;				//1.虚拟货币，2.RMB
-    @prop({ required: true })
     goods: string;		            // 商品信息
 
     //添加购买记录
-    public static async addBuyRecord(serverId: number, activityId: number, roleId: string, roundIndex: number, index: number, price: number, priceType: number, goods: string) {
+    public static async addBuyRecord(serverId: number, activityId: number, roleId: string, roundIndex: number, index: number, goods: string) {
         await ActivitySelfServiceShopModel.insertMany([
-            { serverId, roleId, activityId, roundIndex, index, price, priceType, goods }
+            { serverId, roleId, activityId, roundIndex, index, goods }
         ])
     }
 
@@ -45,8 +41,8 @@ export default class Activity_Self_Service_Shop extends BaseModel {
     }
 
     //查询购买价格类型的数据
-    public static async findDataByPriceType(serverId: number, activityId: number, roleId: string, roundIndex: number, priceType: number, lean = true) {
-        let result: ActivitySelfServiceShopModelType[] = await ActivitySelfServiceShopModel.find({ serverId, roleId, activityId, priceType, roundIndex }).lean(lean);
+    public static async findDataByPriceType(serverId: number, activityId: number, roleId: string, roundIndex: number, lean = true) {
+        let result: ActivitySelfServiceShopModelType[] = await ActivitySelfServiceShopModel.find({ serverId, roleId, activityId, roundIndex }).lean(lean);
         return result;
     }