✨ feat(37需求): 修改返利逻辑

game-server/app/services/activity/rebateService.ts

@@ -0,0 +1,42 @@
+import { HistoryOrderModel } from "../../db/HistoryOrder";
+import { UserModel } from "../../db/User";
+import { RebateData } from "../../domain/activityField/rebateField";
+import { getRoleCreateTime, getServerCreateTime } from "../redisService";
+import { getActivityById } from "./activityService";
+
+/**
+   * 玩家活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getPlayerRebateData(activityId: number, serverId: number, roleId: string, uid: number) {
+    let activityData = await getActivityById(activityId);
+    let createTime = await getRoleCreateTime(roleId);
+    let serverTime = await getServerCreateTime(serverId);
+    let playerData = new RebateData(activityData, createTime, serverTime);
+    let user = await UserModel.findUserByUid(uid);
+    if(user.channelId) {
+        let playerRecords = await HistoryOrderModel.findByChannelId(user.channelId);
+        playerData.setPlayerRecords(playerRecords, user);
+    }
+    return playerData;
+}
+
+/**
+   * 玩家活动数据显示
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getPlayerRebateDataShow(activityId: number, serverId: number, roleId: string, uid: number) {
+    let playerData = await getPlayerRebateData(activityId, serverId, roleId, uid);
+    if(playerData && playerData.canShow && playerData.canShow()) {
+        return playerData.getShowResult();
+    }
+    return null
+}

game-server/app/services/checkParam.ts

@@ -488,6 +488,11 @@ export function checkRouteParam(route: string, msg: any) {
                 if(!checkNaturalNumbers(msg.activityId, msg.pageIndex, msg.dayIndex)) return false;
                 break;
             }
+        case 'activity.rebateHandler.receiveReward':
+            {
+                if(!checkNaturalNumbers(msg.activityId, msg.day)) return false;
+                break;
+            }
         case "battle.barrageHandler.getBarrageList":
             {
                 if(!checkNaturalStrings(msg.rid)) return false;
@@ -2085,6 +2090,7 @@ export function checkRouteParam(route: string, msg: any) {
         case "chat.chatHandler.debugPushMessage":
         case "activity.monthlyFundHandler.debugSendMonthlyFundReward":
         case "activity.bindPhoneHandler.debugSetGiftCodeStatus":
+        case 'activity.rebateHandler.debugSetRebate':
         
             {
                 if (msg.magicWord !== DEBUG_MAGIC_WORD || !isDevelopEnv()) return false;

game-server/app/services/normalBattleService.ts

@@ -20,7 +20,6 @@ import { calculateCeWithRole } from './playerCeService';
 import { sendMessageToUserWithSuc } from './pushService';
 import { ActionPointModel } from '../db/ActionPoint';
 import { GK_MAIN, GK_MAINELITE, RECHARGE } from '../pubUtils/dicParam';
-import { rebateHistoryOrder } from './orderService';
 import { updateGVGBattleRoleInfo } from './gvg/gvgTeamService';
 
 export async function roleLevelup(type: KING_EXP_RATIO_TYPE, roleId: string, kingExp: number = 0, session: BackendSession) {
@@ -53,10 +52,6 @@ export async function roleLevelup(type: KING_EXP_RATIO_TYPE, roleId: string, kin
         // await calculateCeWithRole(HERO_SYSTEM_TYPE.ROLE_LV, roleId, serverId, sid, { lv: newLv });
 
         await updateRoleOnlineInfo(roleId, { lv: newLv });
-        // 达到等级返利
-        if(lv < RECHARGE.RECHARGE_RMB_RETURN_LEVEL_LIMITED && newLv >= RECHARGE.RECHARGE_RMB_RETURN_LEVEL_LIMITED) {
-            rebateHistoryOrder(roleId, role.userInfo?.uid);
-        }
 
         await updateGVGBattleRoleInfo(serverId, roleId, { lv });
     }

game-server/app/services/orderService.ts

@@ -31,10 +31,6 @@ import { addGuildPay } from './activity/guildPayService';
 import { sendMessageToUserWithSuc } from './pushService';
 import { checkParamPrice, needRebate } from '../pubUtils/sdkUtil';
 import { checkShopCanBuyInOrder, makeShopOrder } from './shopService';
-import { UserModel } from '../db/User';
-import { HistoryOrderModel } from '../db/HistoryOrder';
-import { sendMailByContent } from './mailService';
-import { RECHARGE } from '../pubUtils/dicParam';
 import { checkWeeklyFund, makeWeeklyFund } from './activity/weeklyFundService';
 import { checkMonthlyFund, makeMonthlyFund } from './activity/monthlyFundService';
 
@@ -424,28 +420,4 @@ export async function refundOrderFromRedisPub(message: string) {
     await UserOrderModel.refund(order.roleId, order.localOrderID, message);
 
     return true
-}
-
-export async function rebateHistoryOrder(roleId: string, uid: number) {
-    let user = await UserModel.findUserByUid(uid);
-    if(user) {
-        let historyOrders = await HistoryOrderModel.findByChannelId(user.channelId);
-        if(needRebate() && historyOrders.length > 0) {
-            for(let historyOrder of historyOrders) {
-                if(!historyOrder.isReceived) {
-                    let totalPay = historyOrder.totalPay;
-                    if(totalPay > 0) {
-                        let gold = 0;
-                        let goods = parseGoodStr(RECHARGE.RECHARGE_RMB_RETURN_RATIO).map(({ id, count }) => {
-                            let result = Math.floor(count * totalPay)
-                            gold += result;
-                            return { id, count: result }
-                        });
-                        await sendMailByContent(MAIL_TYPE.REBATE, roleId, { goods, params: [`${totalPay}`, `${gold}`] });
-                        await HistoryOrderModel.receive(historyOrder._id, roleId);
-                    }
-                }
-            }
-        }
-    }
 }