军团活动：邮件功勋数量错误

game-server/app/services/guildActivity/guildActivityService.ts

@@ -462,7 +462,7 @@ export async function cityActivitySettleReward(cityId: number, serverId: number)
         await genAuction(guildCode, AUCTION_SOURCE.CITY, rec.code, serverId, rewards);
 
         let dic = gameData.guildActivity.get(GUILD_ACTIVITY_TYPE.CITY_ACTIVITY);
-        let myR = new Rank(REDIS_KEY.USER_GATE_ACTIVITY, { serverId, guildCode }, true);
+        let myR = new Rank(REDIS_KEY.USER_CITY_ACTIVITY, { serverId, guildCode }, true);
         let ranks = <RoleRankInfo[]>await myR.getRankByRange();
         let userRank = 0;
         let hasSentMember: string[] = [];

game-server/app/services/guildService.ts

@@ -171,13 +171,6 @@ export async function addActive(roleId: string, serverId: number, id: number, ty
 
     let guildCode = userGuild.guildCode;
     // 周结算锁
-    let weeklySumLock = await lockDataNoRetry(serverId, DATA_NAME.WEEKLY_GUILD_SUM, guildCode);
-    if (!!weeklySumLock.err) {
-        weeklySumLock.releaseCallback();
-        return { status: 0, resResult: resResult(STATUS.GUILD_WEEKLY_SUM) };
-    }
-    weeklySumLock.releaseCallback();
-
     let { activeRecord } = userGuild;
     if (id != 0) { // 用于debug，传0时直接增加活跃
         let curActiveRecord = activeRecord.find(cur => cur.id == id);

game-server/app/util/routeUtil.ts

@@ -53,7 +53,6 @@ export function guild(session: Session, msg: any, app: Application, cb: (err: Er
 
     let rid = session.get('roleId');
 
-    console.log('#### arg', msg.args);
     if (msg.args && msg.args.length > 0) {
         for (let arg of msg.args) {
             if (!arg.route) continue;

shared/pubUtils/data.ts

@@ -651,6 +651,7 @@ export function getAuctionRewardByPoolId(poolId: number) {
  * @param rank 成员在军团内部排名
  */
 export function getCityActivityRewards(type: number, guildRank: number, rank: number) {
+    console.log('######## getCityActivityRewards', type, guildRank, rank);
     let ranksReward = gameData.cityActivityReward.get(type) || [];
     let dic = ranksReward.find(cur => {
         return cur.guildRank == guildRank && (rank >= cur.min && (rank <= cur.max || cur.max == 0));