Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java

@@ -21,6 +21,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -70,7 +71,7 @@ public class LogMsgSendFilter extends LevelFilter {
                     stringBuilder.append("\n");
                 }
 
-                stringBuilder.append("故障时间：").append(DateUtils.formatTimestamp(event.getTimeStamp(),DateUtils.DATE_TIME_PATTERN));
+                stringBuilder.append("故障时间：").append(DateUtils.format(new Date(event.getTimeStamp()),DateUtils.DATE_TIME_PATTERN));
                 stringBuilder.append("\n");
                 stringBuilder.append("TraceId：").append(Thread.currentThread().getName());
                 stringBuilder.append("\n");

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -583,7 +583,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			Result result = epmetUserFeignClient.saveResiInfo(userResiInfoDTO);
 			log.info("isResiRegister epmetUserFeignClient.saveResiInfo result:{}",JSON.toJSONString(result));
 			if (!result.success()){
-				throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(),EpmetErrorCode.SERVER_ERROR.getMsg());
+				throw new RenException(result.getCode(),result.getMsg());
 			}
 		}else{
 			log.info("isResiRegister partyMember have registered resi，userId:{}",partyMemberInfoDTO.getUserId());

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

@@ -310,8 +310,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			//更新该用户在该客户下的注册状态
 			userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
 		}else{
-			log.error("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO));
+			log.warn("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO));
-			throw new RenException(EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getCode());
+			throw new RenException(EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getCode(),EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getMsg());
 		}
 
 		return result;