活动:修改结构
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts';
|
||||
import { ActivityModel, ActivityModelType } from '../../db/Activity';
|
||||
import { RoleModel } from '../../db/Role';
|
||||
import { ServerlistModel } from '../../db/Serverlist';
|
||||
import { UserOrderModel, UserOrderModelType } from '../../db/UserOrder';
|
||||
import { RewardParam } from '../../domain/activityField/rewardField';
|
||||
@@ -23,7 +24,8 @@ export async function yuanbaoActivity(serverId: number, roleId: string) {
|
||||
}
|
||||
let activityData = activityArray[0];
|
||||
let playerRecord: UserOrderModelType[] = await UserOrderModel.findOrderByActivityID(activityData.activityId, roleId);
|
||||
let playerData = new YuanBaoShopData(activityData);
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new YuanBaoShopData(activityData, createTime);
|
||||
playerData.setPlayerRecords(playerRecord);
|
||||
return playerData;
|
||||
}
|
||||
@@ -40,7 +42,8 @@ export async function getPlayerYuanbaoShopData(activityId: number, serverId: num
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
|
||||
let playerRecord: UserOrderModelType[] = await UserOrderModel.findOrderByActivityID(activityId, roleId);
|
||||
|
||||
let playerData = new YuanBaoShopData(activityData);
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new YuanBaoShopData(activityData, createTime);
|
||||
playerData.setPlayerRecords(playerRecord);
|
||||
return playerData;
|
||||
}
|
||||
@@ -62,7 +65,8 @@ export async function makeYuanbaoShopReward(roleId: string, roleName: string, si
|
||||
if (activityData.type !== ACTIVITY_TYPE.YUAN_BAO_SHOP) {
|
||||
return STATUS.ACTIVITY_TYPE_ERROR;
|
||||
}
|
||||
let playerData = new YuanBaoShopData(activityData);
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new YuanBaoShopData(activityData, createTime);
|
||||
let item = playerData.findItem(productID);
|
||||
|
||||
let rewardParamArr: Array<RewardParam> = [];
|
||||
|
||||
Reference in New Issue
Block a user