活动：vip签到判断购买条件

shared/consts/constModules/activityConst.ts

@@ -9,7 +9,7 @@ export enum ACTIVITY_TYPE {
     TASK_GROWTH = 2, // 成长任务活动
     TASK_DAILY_CHALLENGES = 3, // 今日挑战活动
     SIGN_IN = 4, // 签到活动
-    SIGN_IN_VIP = 5, // 签到活动(高级)
+    SIGN_IN_VIP = 5, // 签到活动(高级)RMB购买
     GROWTH_FUND_MAIN = 6, // 主线成长基金
     GROWTH_FUND_MAIN_VIP = 7, // 主线成长基金（高阶）
     GROWTH_FUND_TOWER = 8, // 镇念塔成长基金
@@ -83,3 +83,8 @@ export enum ORDER_STATE {
     CHECK_ORDER = 2, // 触发查询订单
     RESULT_FAIL = 3, // 订单失败
 }
+
+//服务器开服时间
+export const SERVER_OPEN_TIME = '2021-02-11T20:03:16.637+08:00';
+//玩家等级大于等于15级才能开启vip签到
+export const SIGNIN_VIP_OPEN_LIMIT = 15;

shared/consts/statusCode.ts

@@ -354,6 +354,8 @@ export const STATUS = {
     ACTIVITY_NEW_PLAYER_LIMIT_PACKAGE_END: { code: 50017, simStr: '新手礼包结束' },
     ACTIVITY_RECHARGE_MONEY_ERROR: { code: 50018, simStr: '充值数据错误' },
     ACTIVITY_RECHARGE_MONEY_NO_REWARD: { code: 50019, simStr: '没有可领取的奖励' },
+    ACTIVITY_SIGNIN_VIP_CONDITION: { code: 50020, simStr: '开启条件不足' },
+    ACTIVITY_SIGNIN_EXPIRE: { code: 50021, simStr: '签到过期，补签' },
     // GM后台相关状态 60000 - 69999
     GM_ERR_PASSWORD: { code: 60001, simStr: '账号或密码错误' },
     GM_MISS_API: { code: 60002, simStr: '未找到该接口' },

shared/db/ActivityRechargeMoney.ts

@@ -41,7 +41,6 @@ export default class ActivityRechargeMoney extends BaseModel {
             { $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);

shared/db/ActivitySignIn.ts

@@ -12,32 +12,47 @@ export default class ActivitySignIn extends BaseModel {
     @prop({ required: true })
     roleId: string;			        // 用户Id
     @prop({ required: true })
+    roundIndex: number;				// 周期数，从活动设置的开始时间计算
+    @prop({ required: true })
     dayIndex: number;				// 第几天 从1开始
     @prop({ required: true })
     isReceive: boolean;			    // 是否领取
 
     //签到记录
-    public static async addSignInRecord(activityId: number, roleId: string, dayIndex: number, lean = true) {
-        let result: ActivitySignInModelType = await ActivitySignInModel.findOneAndUpdate({ roleId, activityId, dayIndex },
+    public static async addSignInRecord(activityId: number, roleId: string, roundIndex: number, dayIndex: number, lean = true) {
+        let result: ActivitySignInModelType = await ActivitySignInModel.findOneAndUpdate({ roleId, activityId, roundIndex, dayIndex },
             { $set: { isReceive: true } }, { upsert: true, new: true }).lean(lean);
         return result;
     }
 
     //根据活动id查询活动数据
-    public static async findData(activityId: number, roleId: string, lean = true) {
-        let result: ActivitySignInModelType[] = await ActivitySignInModel.find({ roleId, activityId }).lean(lean);
+    public static async findData(activityId: number, roleId: string, roundIndex: number, lean = true) {
+        let result: ActivitySignInModelType[] = await ActivitySignInModel.find({ roleId, activityId, roundIndex }).lean(lean);
         return result;
     }
 
     //查询第几天的活动数据
-    public static async findDataByDayIndex(activityId: number, roleId: string, dayIndex: number, lean = true) {
-        let result: ActivitySignInModelType[] = await ActivitySignInModel.find({ roleId, activityId, dayIndex }).lean(lean);
+    public static async findDataByDayIndex(activityId: number, roleId: string, roundIndex: number, dayIndex: number, lean = true) {
+        let result: ActivitySignInModelType[] = await ActivitySignInModel.find({ roleId, activityId, roundIndex, dayIndex }).lean(lean);
+        return result;
+    }
+
+    //查询第几天的活动数据
+    public static async isBuyVip(activityId: number, roleId: string, roundIndex: number) {
+        let result: ActivitySignInModelType = await ActivitySignInModel.findOne({ roleId, activityId, roundIndex, dayIndex: 0 }).lean(true);
+        return result;
+    }
+
+    //购买vip记录
+    public static async buyVIP(activityId: number, roleId: string, roundIndex: number) {
+        let result: ActivitySignInModelType = await ActivitySignInModel.findOneAndUpdate({ roleId, activityId, roundIndex },
+            { $set: { dayIndex: 0 } }, { upsert: true, new: true }).lean(true);
         return result;
     }
 
     //删除签到记录
-    public static async deleteActivity(activityId: number, roleId: string, dayIndex: number) {
-        await ActivitySignInModel.deleteMany({ roleId, activityId, dayIndex });
+    public static async deleteActivity(activityId: number, roleId: string, roundIndex: number, dayIndex: number) {
+        await ActivitySignInModel.deleteMany({ roleId, activityId, roundIndex, dayIndex });
     }
 }
 

shared/domain/activityField/rechargeMoneyField.ts

@@ -29,7 +29,7 @@ export class RechargeMoneyData extends ActivityBase {
     totalCount: number = 0;//一共可领取次数
     receiveCount: number = 0;//已经领取次数
 
-    recordArray = []
+    recordArray: ActivityRechargeMoneyModelType[] = [];
 
     //当前回合最后一个
     public isLast() {

shared/domain/activityField/signInField.ts

@@ -1,3 +1,4 @@
+import moment = require('moment');
 import { ACTIVITY_RESOURCES_TYPE } from '../../consts';
 import { ActivityModelType } from '../../db/Activity';
 import { ActivitySignInModelType } from '../../db/ActivitySignIn';
@@ -49,6 +50,8 @@ export class SignInItem {
 // 成长活动数据
 export class SignInData extends ActivityBase {
     list: Array<SignInItem> = [];
+    roundIndex: number = 0;//活动周期
+    todayIndex: number = 0;//本月第几天
 
     //第几天的签到奖励
     public findDayItem(dayIndex: number) {
@@ -68,6 +71,11 @@ export class SignInData extends ActivityBase {
 
     public initData(data: string) {
         let arr = JSON.parse(data);
+
+        this.roundIndex = moment(this.beginTime).diff(moment(), 'months');
+        console.log('dddddddddddd', this.roundIndex);
+        this.todayIndex = moment(Date.now()).date();
+
         for (let obj of arr) {
             console.log('obj', obj)
             this.list.push(new SignInItem(obj))