xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：弹出礼包订单添加参数

Browse Source
This commit is contained in:
qiaoxin
2021-06-09 18:52:54 +08:00
parent 4ed8f286f1
commit ff45e0f096
10 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
shared/db/ActivityPopUpShop.ts
View File

@@ -1,5 +1,6 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import moment = require('moment');
/**
@@ -32,11 +33,10 @@ export default class Activity_Pop_Up_Shop extends BaseModel {
isPush: boolean; // 是否推送过
//购买记录
public static async addRecord(serverId: number, activityId: number, roleId: string, id: number, type: number, buyCount: number) {
let nowDate = new Date();
public static async addRecord(serverId: number, activityId: number, roleId: string, id: number, type: number, buyCount: number, beginTime: Date) {
let result: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findOneAndUpdate({
serverId, roleId, activityId, id, type,
beginTime: { $lt: nowDate }, endTime: { $gt: nowDate }
beginTime: beginTime
},
{ $inc: { buyCount: buyCount } }, { upsert: true, new: true }).lean(true);
return result;
@@ -61,16 +61,16 @@ export default class Activity_Pop_Up_Shop extends BaseModel {
return result;
}
//根据活动taskId查询现在正在开启的商店数据
public static async findOpenDataByTaskId(serverId: number, activityId: number, roleId: string, id: number, type: number) {
let nowDate = new Date();
//根据活动开始时间查询现在正在开启的商店数据
public static async findDataByBeginTime(serverId: number, activityId: number, roleId: string, id: number, type: number, beginTime: Date) {
console.log('beginTime', serverId, roleId, activityId, id, type, beginTime)
let result: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findOne({
serverId, roleId, activityId, id, type,
beginTime: { $lt: nowDate }, endTime: { $gt: nowDate }
serverId, roleId, activityId, id, type, beginTime: beginTime
}).lean(true);
return result;
}
//根据活动统计完成任务次数
public static async setTaskCount(serverId: number, activityId: number, roleId: string, id: number, type: number, count: number) {
let result: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findOneAndUpdate({ serverId, roleId, activityId, id, type },

6
shared/db/UserOrder.ts
View File

@@ -29,6 +29,8 @@ export default class UserOrder extends BaseModel {
message: string; // 信息
@prop({ required: true })
activityId: number; // 活动ID
@prop({ required: true })
paramStr: string; // 订单参数
//保存平台订单号
@@ -101,9 +103,9 @@ export default class UserOrder extends BaseModel {
//新增订单
public static async applyOrder(serverId: number, roleId: string, productID: string, localOrderID: string, orderID: string, price: number, payType: number, activityId: number, message: string = '') {
public static async applyOrder(serverId: number, roleId: string, productID: string, localOrderID: string, orderID: string, price: number, payType: number, activityId: number, paramStr: string, message: string) {
let result: UserOrderModelType = await UserOrderModel.findOneAndUpdate({ serverId, roleId, productID, localOrderID, orderID, payType, activityId },
{ $set: { price, state: ORDER_STATE.APPLY, message } },
{ $set: { price, state: ORDER_STATE.APPLY, message, paramStr: paramStr ? paramStr : '' } },
{ upsert: true, new: true }).lean(true);
return result;
}