活动：每日充值

shared/db/ActivityRechargeMoney.ts

@@ -19,31 +19,24 @@ export default class Activity_Recharge_Money extends BaseModel {
     @prop({ required: true })
     RMB: number;			// 充值金额
     @prop({ required: true })
-    index: number;		    // 第几个格子
+    poolId: number;		    // 奖池唯一id
     @prop({ required: true })
     reward: string;		    // 领取奖励内容
     @prop({ required: true })
     rewardTime: Date;		    // 领取奖励时间
-    @prop({ required: true })
-    isEnd: boolean;		    // 结束
 
     //添加领取记录
-    public static async addRecord(_id: string, id: number, reward: string) {
+    public static async addRecord(_id: string, poolId: number, reward: string) {
+        console.log(_id, poolId, reward)
         let result: ActivityRechargeMoneyModelType = await ActivityRechargeMoneyModel.findOneAndUpdate({ _id },
-            { $set: { index: id, reward, rewardTime: new Date() } },
+            { $set: { poolId, reward, rewardTime: new Date() } },
             { upsert: true, new: true }).lean(true);
         return result;
     }
 
-    //本轮结束
-    public static async setEndState(serverId: number, roleId: string, _ids: string[]) {
-        await ActivityRechargeMoneyModel.updateMany({ serverId, roleId, _id: { $in: _ids } },
-            { $set: { isEnd: true } }, { multi: true, });
-    }
-
     //查询
-    public static async findData(serverId: number, roleId: string) {
-        let result: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.find({ serverId, roleId, isEnd: { $ne: true } }).lean(true);
+    public static async findDataByTime(serverId: number, roleId: string, beginTime: Date, endTime: Date) {
+        let result: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.find({ serverId, roleId, beginTime: { $gte: beginTime }, endTime: { $lte: endTime } }).sort({ beginTime: 1 }).lean(true);
         return result;
     }