返利：修改返利逻辑

game-server/app/services/orderService.ts

@@ -32,7 +32,7 @@ import { makeTaskPass } from './activity/taskPassService';
 import { addGuildPay } from './activity/guildPayService';
 import { sendMessageToUserWithSuc } from './pushService';
 import { gameData } from '../pubUtils/data';
-import { checkParamPrice } from '../pubUtils/sdkUtil';
+import { checkParamPrice, needRebate } from '../pubUtils/sdkUtil';
 import { checkShopCanBuyInOrder, makeShopOrder } from './shopService';
 import { UserModel } from '../db/User';
 import { HistoryOrderModel } from '../db/HistoryOrder';
@@ -359,18 +359,22 @@ export async function refundOrderFromRedisPub(message: string) {
 export async function rebateHistoryOrder(roleId: string, uid: number) {
     let user = await UserModel.findUserByUid(uid);
     if(user) {
-        let historyOrder = await HistoryOrderModel.findByChannelId(user.channelId);
+        let historyOrders = await HistoryOrderModel.findByChannelId(user.channelId);
-        if(historyOrder && !historyOrder.isReceived) {
+        if(needRebate() && historyOrders.length > 0) {
-            let totalPay = historyOrder.totalPay;
+            for(let historyOrder of historyOrders) {
-            if(totalPay > 0) {
+                if(!historyOrder.isReceived) {
-                let gold = 0;
+                    let totalPay = historyOrder.totalPay;
-                let goods = parseGoodStr(RECHARGE.RECHARGE_RMB_RETURN_RATIO).map(({ id, count }) => {
+                    if(totalPay > 0) {
-                    let result = Math.floor(count * totalPay)
+                        let gold = 0;
-                    gold += result;
+                        let goods = parseGoodStr(RECHARGE.RECHARGE_RMB_RETURN_RATIO).map(({ id, count }) => {
-                    return { id, count: result }
+                            let result = Math.floor(count * totalPay)
-                });
+                            gold += result;
-                await sendMailByContent(MAIL_TYPE.REBATE, roleId, { goods, params: [`${totalPay}`, `${gold}`] });
+                            return { id, count: result }
-                await HistoryOrderModel.receive(user.channelId, roleId);
+                        });
+                        await sendMailByContent(MAIL_TYPE.REBATE, roleId, { goods, params: [`${totalPay}`, `${gold}`] });
+                        await HistoryOrderModel.receive(user.channelId, roleId);
+                    }
+                }
             }
         }
     }

shared/db/HistoryOrder.ts

@@ -30,13 +30,12 @@ export default class HistoryOrder extends BaseModel {
     receiveRoleId: string;              // 领取的玩家id
 
     public static async findByChannelId(channelId: string) {
-        let result: HistoryOrderModelType = await HistoryOrderModel.findOne({ channelId }).lean();
+        let result: HistoryOrderModelType[] = await HistoryOrderModel.find({ channelId }).lean();
         return result;
     }
 
     public static async receive(channelId: string, roleId: string) {
-      let result: HistoryOrderModelType = await HistoryOrderModel.findOneAndUpdate({ channelId }, { $set: { isReceived: true, receiveRoleId: roleId } }, { new: true }).lean();
+      await HistoryOrderModel.updateMany({ channelId }, { $set: { isReceived: true, receiveRoleId: roleId } }, { new: true }).lean();
-      return result;
   }
 }
 

shared/pubUtils/dictionary/DicServerConst.ts

@@ -41,6 +41,8 @@ export interface DicServerConst {
     readonly ACCESS_CODE_EXPIRE_TIME: number;
     // 是否跳过加密
     readonly SKIP_ENCODE: number;
+    // 是否返利
+    readonly NEED_REBATE: number;
 }
 
 export const dicServerConst: DicServerConst = {} as DicServerConst;

shared/pubUtils/sdkUtil.ts

@@ -165,4 +165,8 @@ export function canPay() {
 
 export function isSkipEncode(isDevelop = false) {
     return gameData.serverConst.SKIP_ENCODE === 1 && isDevelop;
+}
+
+export function needRebate() {
+    return gameData.serverConst.NEED_REBATE == 1;
 }

shared/resource/jsons/server_const.json

@@ -22,5 +22,6 @@
     "DEBUG_TIME": 1,
     "CHECK_WORD": 1,
     "CAN_PAY": 1,
-    "SKIP_ENCODE": 0
+    "SKIP_ENCODE": 0,
+    "NEED_REBATE": 0
 }