活动:修改结构

This commit is contained in:
qiaoxin
2021-06-30 11:41:38 +08:00
parent 550ec29842
commit 3cff8acf3a
60 changed files with 260 additions and 169 deletions

View File

@@ -6,6 +6,7 @@ import moment = require('moment');
import { RewardParam } from '../../domain/activityField/rewardField';
import { addReward, stringToRewardParam } from './giftPackageService';
import { ServerlistModel } from '../../db/Serverlist';
import { RoleModel } from '../../db/Role';
/**
* 获取活动数据
@@ -38,8 +39,8 @@ export async function dailyRMBGiftsActivity(serverId: number, roleId: string) {
*/
export async function getPlayerDailyRMBGiftsData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerData = new DailyRMBGiftsData(activityData);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new DailyRMBGiftsData(activityData, createTime);
// let productID = playerData.productID;
// let playerOrders: UserOrderModelType[] = await UserOrderModel.findPlayerOrder(productID, roleId, activityId, 1);
// let buyTime = moment(new Date()).startOf('d').toDate()
@@ -72,7 +73,8 @@ export async function makeDailyRMBGiftsReward(roleId: string, roleName: string,
code: STATUS.ACTIVITY_TYPE_ERROR,
}
}
let playerData = new DailyRMBGiftsData(activityData);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new DailyRMBGiftsData(activityData, createTime);
let bigGiftProductID = playerData.productID;
if (bigGiftProductID == productID) {//一次性购买7天礼包
let playerRecord: ActivityDailyRMBGiftsModelType = await ActivityDailyRMBGiftsModel.findRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate());