时间

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -467,18 +467,29 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         //2、修改历史徽章表
         LambdaUpdateWrapper<UserBadgeCertificateRecordEntity> recUpdate=new LambdaUpdateWrapper<>();
-        recUpdate.set(UserBadgeCertificateRecordEntity::getGridId,newGridInfo.getId());
+        recUpdate.set(UserBadgeCertificateRecordEntity::getGridId,newGridInfo.getId())
+                .set(UserBadgeCertificateRecordEntity::getUpdatedBy,formDTO.getUserId())
+                .set(UserBadgeCertificateRecordEntity::getUpdatedTime,new Date());
         recUpdate.eq(UserBadgeCertificateRecordEntity::getCustomerId,formDTO.getCustomerId())
                  .eq(UserBadgeCertificateRecordEntity::getUserId,formDTO.getUserId());
         userBadgeCertificateRecordDao.update(null,recUpdate);
 
         LambdaUpdateWrapper<ResiUserBadgeEntity> badgeUpdate=new LambdaUpdateWrapper<>();
-        badgeUpdate.set(ResiUserBadgeEntity::getGridId,newGridInfo.getId());
+        badgeUpdate.set(ResiUserBadgeEntity::getGridId,newGridInfo.getId())
+                .set(ResiUserBadgeEntity::getUpdatedBy,formDTO.getUserId())
+                .set(ResiUserBadgeEntity::getUpdatedTime,new Date());;
         badgeUpdate.eq(ResiUserBadgeEntity::getCustomerId,formDTO.getCustomerId())
                 .eq(ResiUserBadgeEntity::getUserId,formDTO.getUserId());
         resiUserBadgeDao.update(null,badgeUpdate);
 
         //3、修改支援者信息表
+        modifyVolunteerGrid(formDTO,newGridInfo);
+
+        //4、删除用户缓存信息
+        userBaseInfoRedis.clearUserCache(Arrays.asList(formDTO.getUserId()));
+    }
+
+    private void modifyVolunteerGrid(ModifyRegGridFormDTO formDTO, GridInfoCache newGridInfo) {
         VolunteerInfoDTO volunteerInfoDTO=new VolunteerInfoDTO();
         volunteerInfoDTO.setCustomerId(formDTO.getCustomerId());
         volunteerInfoDTO.setUserId(formDTO.getUserId());
@@ -490,8 +501,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if (!volunteerRes.success()) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民端_修改注册网格:修改用户志愿者信息异常", "服务器开小差了...");
         }
-        //4、删除用户缓存信息
-        userBaseInfoRedis.clearUserCache(Arrays.asList(formDTO.getUserId()));
     }
 
 }