活动:调整每日优惠的结构
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../consts';
|
||||
import { ACTIVITY_TYPE, REFRESH_TIME, STATUS, TASK_TYPE } from '../consts';
|
||||
import { ActivityModel, ActivityModelType } from '../db/Activity';
|
||||
import { ActivityDailyRMBGiftsModel, ActivityDailyRMBGiftsModelType } from '../db/ActivityDailyRMBGifts';
|
||||
import { DailyRMBGiftsData, DailyRMBGiftsItem } from '../domain/activityField/dailyRMBGiftsField';
|
||||
@@ -46,14 +46,15 @@ export async function getPlayerDailyGiftsData(activityId: number, serverId: numb
|
||||
|
||||
let playerOrders: UserOrderModelType[] = await UserOrderModel.findPlayerOrder(productID, roleId, activityId, 1);
|
||||
let buyTime = moment(new Date()).startOf('d').toDate()
|
||||
let endTime = moment(new Date()).endOf('d').toDate()
|
||||
let endTime = null;
|
||||
if (playerOrders.length > 0) {
|
||||
buyTime = playerOrders[0].createdAt;//购买时候的日期
|
||||
endTime = moment(buyTime).add(7, 'd').endOf('d').toDate()
|
||||
}
|
||||
let playerRecords: ActivityDailyRMBGiftsModelType[] = await ActivityDailyRMBGiftsModel.findRecord(serverId, activityId, roleId, buyTime);
|
||||
let playerRecord: ActivityDailyRMBGiftsModelType = await ActivityDailyRMBGiftsModel.findRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate());
|
||||
let unReceiveRecord: ActivityDailyRMBGiftsModelType[] = await ActivityDailyRMBGiftsModel.findBuyRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate());
|
||||
|
||||
playerData.setPlayerRecords(playerRecords, endTime);
|
||||
playerData.setPlayerRecords(playerRecord, unReceiveRecord.length);
|
||||
return playerData;
|
||||
}
|
||||
|
||||
@@ -69,23 +70,34 @@ export async function getPlayerDailyGiftsData(activityId: number, serverId: numb
|
||||
export async function makeDailyRMBGiftsReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
|
||||
activityId: number, productID: string) {
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
|
||||
if (activityData.type !== ACTIVITY_TYPE.RECHARGE_MONEY) {
|
||||
return STATUS.ACTIVITY_TYPE_ERROR;
|
||||
if (activityData.type !== ACTIVITY_TYPE.DAILY_RMB_GIFTS) {
|
||||
return {
|
||||
code: STATUS.ACTIVITY_TYPE_ERROR,
|
||||
}
|
||||
}
|
||||
let playerData = new DailyRMBGiftsData(activityData);
|
||||
let bigGiftProductID = playerData.productID;
|
||||
if (bigGiftProductID == productID) {//一次性购买7天礼包
|
||||
let buyTime = moment(new Date()).startOf('d').toDate()
|
||||
let endTime = moment(buyTime).add(7, 'd').endOf('d').toDate()
|
||||
for (let i = 0; i < playerData.day; i++) {
|
||||
let beginTime = playerData.beginTime + 24 * 60 * 60 * 1000 * i;
|
||||
// let beginTime = moment(new Date()).startOf('d').add(i, 'day').add(REFRESH_TIME, 'h').toDate();
|
||||
await ActivityDailyRMBGiftsModel.buyRecord(serverId, activityId, roleId, moment(beginTime).toDate(), true);
|
||||
}
|
||||
let endTime = moment(playerData.endTime).add(playerData.day, 'd').toDate()
|
||||
return {
|
||||
code: 0,
|
||||
data: Object.assign({}, { item: { endTime, receiveCount: 0 } })
|
||||
}
|
||||
} else {
|
||||
let item = playerData.findProduct(productID);
|
||||
if (!item) {
|
||||
return {
|
||||
code: STATUS.ACTIVITY_NO_PRODUCT,
|
||||
}
|
||||
}
|
||||
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
|
||||
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
|
||||
item.isBuy = true;
|
||||
await ActivityDailyRMBGiftsModel.receiveRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate(), [item.id]);
|
||||
item.isReceive = true;
|
||||
return {
|
||||
code: 0,
|
||||
|
||||
Reference in New Issue
Block a user