活动：大额累计充值活动

shared/db/ActivityThirtyDays.ts

@@ -27,6 +27,10 @@ export default class Activity_Thirty_Days extends BaseModel {
     isReceive: boolean;				// 是否领取过奖励
     @prop({ required: true })
     data: string;					// 数据信息
+    @prop({ required: true })
+    isPush: boolean;				// 推送过消息
+
+
 
     //添加领取记录
     public static async addRecord(serverId: number, activityId: number, roleId: string, pageIndex: number, cellIndex: number, tab: number) {
@@ -56,6 +60,13 @@ export default class Activity_Thirty_Days extends BaseModel {
         return result;
     }
 
+    //推送标记
+    public static async pushMessage(serverId: number, activityId: number, roleId: string, pageIndex: number, cellIndex: number, tab: number, type: number) {
+        let result: ActivityThirtyDaysModelType = await ActivityThirtyDaysModel.findOneAndUpdate({ serverId, roleId, activityId, pageIndex, cellIndex, tab, type },
+            { $set: { isPush: true, } }, { upsert: true, new: true }).lean(true);
+        return result;
+    }
+
     //根据活动id查询活动数据
     public static async findData(serverId: number, activityId: number, roleId: string, lean = true) {
         let result: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.find({ serverId, roleId, activityId }).lean(lean);

shared/db/ActivityVipRechargeMoney.ts

@@ -0,0 +1,63 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+
+class RewardRecord {
+    @prop({ required: true })
+    id: number;		    // 奖励id
+    @prop({ required: true })
+    time: Date;		    // 领取时间
+}
+
+/**
+  * Vip累计充值活动 
+*/
+@index({ roleId: 1 })
+
+export default class Activity_Vip_Recharge_Money extends BaseModel {
+
+    @prop({ required: true })
+    serverId: number;		    // 区号
+    @prop({ required: true })
+    activityId: number;		    // 活动id
+    @prop({ required: true })
+    roleId: string;				// 用户id
+    @prop({ required: true })
+    RMB: number;			   // 充值金额
+    @prop({ required: true })
+    record: RewardRecord[];		// 领取奖励记录
+    @prop({ required: true })
+    isEnd: boolean;		    // 结束
+
+    //添加领取记录
+    public static async addRecord(serverId: number, activityId: number, roleId: string, id: number) {
+        let result: ActivityVipRechargeMoneyModelType = await ActivityVipRechargeMoneyModel.findOneAndUpdate({ serverId, activityId, roleId },
+            { $push: { record: { id, time: new Date() } } },
+            { upsert: true, new: true }).lean(true);
+        return result;
+    }
+
+    //活动结束
+    public static async setEndState(serverId: number, activityId: number, roleId: string) {
+        await ActivityVipRechargeMoneyModel.findOneAndUpdate({ serverId, activityId, roleId },
+            { $set: { isEnd: true } }).lean(true);
+    }
+
+    //查询
+    public static async findData(serverId: number, roleId: string, activityId: number) {
+        let result: ActivityVipRechargeMoneyModelType = await ActivityVipRechargeMoneyModel.findOne({ serverId, roleId, activityId }).lean(true);
+        return result;
+    }
+
+    //统计支付金额
+    public static async addRMB(serverId: number, roleId: string, activityId: number, RMB: number) {
+        let result: ActivityVipRechargeMoneyModelType = await ActivityVipRechargeMoneyModel.findOneAndUpdate({ serverId, roleId, activityId },
+            { $inc: { RMB } },
+            { upsert: true, new: true }).lean(true);
+        return result;
+    }
+}
+
+export const ActivityVipRechargeMoneyModel = getModelForClass(Activity_Vip_Recharge_Money);
+
+export interface ActivityVipRechargeMoneyModelType extends Pick<DocumentType<Activity_Vip_Recharge_Money>, keyof Activity_Vip_Recharge_Money> { }
+export type ActivityVipRechargeMoneyModelTypeParam = Partial<ActivityVipRechargeMoneyModelType>; // 将所有字段变成可选项

shared/db/UserOrder.ts

@@ -93,6 +93,13 @@ export default class UserOrder extends BaseModel {
         return result;
     }
 
+    //查询订单详情
+    public static async findOrderList(serverId: number, roleId: string, begin: number, count: number) {
+        let result: UserOrderModelType[] = await UserOrderModel.find({ serverId, roleId, state: ORDER_STATE.RESULT_SUCCESS }, { price: 1, createdAt: 1, productID: 1 }).skip(begin).limit(count).sort({ createdAt: -1 }).lean(true);
+        return result;
+    }
+
+
     //新增订单
     public static async applyOrder(serverId: number, roleId: string, productID: string, localOrderID: string, orderID: string, price: number, payType: number, activityId: number, message: string = '') {
         let result: UserOrderModelType = await UserOrderModel.findOneAndUpdate({ serverId, roleId, productID, localOrderID, orderID, payType, activityId },