军团活动：修复粮草先行code不传的问题

shared/domain/battleField/guildActivity.ts

@@ -20,6 +20,8 @@ class WoodenHorseMember {
     roleName: string;
     sid: string;
     items?: RewardInter[];
+    code?: string;
+
 }
 
 // 木牛流马
@@ -189,9 +191,9 @@ export class WoodenHorse {
     }
 
 
-    public joinMember(roleId: string, roleName: string, sid: string) {
+    public joinMember(roleId: string, roleName: string, sid: string, code: string) {
         if(this.members.findIndex(cur => cur.roleId == roleId) == -1) {
-            this.members.push({ roleId, roleName, sid });
+            this.members.push({ roleId, roleName, sid, code });
             this.speed++;
             this.memberCnt++;
         }
@@ -254,6 +256,8 @@ export class Member {
     roleId: string;            // 玩家id
     @prop({required: true})
     job: number;             // 在军团的职位
+    @prop({required: false})
+    code?: string;             // 玩家的当前记录的code
 }
 
 export class CityParam {

shared/pubUtils/logUtil.ts

@@ -26,7 +26,9 @@ function getParamByRole(role: RoleType) {
 export async function saveLoginAndOutLog(type: LOG_TYPE, session: any) {
     try {
         let params = getParamBySession(session);
-        await UserLogModel.createRecord({ type, ...params });
+        if(params.roleId && params.roleName) {
+            await UserLogModel.createRecord({ type, ...params });
+        }
     } catch (e) {
         console.error(e);
     }

shared/pubUtils/roleUtil.ts

@@ -364,7 +364,10 @@ export class CreateHeroes extends UpdateHeroes {
 
 export async function deletRole(roleId: string) {
     let role = await RoleModel.findByRoleId(roleId);
-    if(!role || !role.hasInit) return false;
+    if(!role ) return false;
+    if(role.hasInit) {
+
+    
     await ActionPointModel.deleteMany({roleId});
     await ActivityBuyRecordsModel.deleteMany({ roleId });
     await ActivityDailyChallengesModel.deleteMany({ roleId });
@@ -479,5 +482,6 @@ export async function deletRole(roleId: string) {
     const update = Object.assign(doc.toJSON(), pick(role, ['serverType', 'userInfo', 'seqId', 'serverId']), { roleName: role.roleId });
     delete update._id;
     await RoleModel.updateMany({ roleId }, { $set: update });
+    }
     return true;
 }