Merge branch 'dev_personal_center' into dev

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java

@@ -36,4 +36,8 @@ public class InitInfoResultDTO implements Serializable {
 	 * 详细地址
 	 */
 	private String buildingAddress;
+	/**
+	 * 昵称
+	 */
+	private String nickname;
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java

@@ -39,6 +39,7 @@ public class PersonalCenterServiceImpl implements PersonalCenterService {
 		resultDTO.setStreet(baseInfoResult.getData().getStreet());
 		resultDTO.setDistrict(baseInfoResult.getData().getDistrict());
 		resultDTO.setBuildingAddress(baseInfoResult.getData().getBuildingAddress());
+		resultDTO.setNickname(baseInfoResult.getData().getNickname());
 		return resultDTO;
 	}
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java

@@ -49,4 +49,9 @@ public class EditInfoFormDTO implements Serializable {
 	 * 详细地址
 	 */
 	private String buildingAddress;
+	/**
+	 * 昵称
+	 */
+	@NotBlank(message = "昵称不能为空")
+	private String nickname;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java

@@ -74,7 +74,7 @@ public class UserBadgeController {
     }
 
     /**
-     * @Description  个人中心-获取徽章认证页面详情
+     * @Description  个人中心-获取徽章认证页面详情 如果是未认证，则将居民base信息带出，如果是已认证，根据上次认证信息显示内容
      * @Param tokenDto
      * @Param certificationDetailFormDTO
      * @author zxc

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java

@@ -47,7 +47,7 @@ public interface UserBadgeService {
     void badgeSendCode(BadgeSendCodeFormDTO badgeSendCodeFormDTO);
 
     /**
-     * @Description  个人中心-获取徽章认证页面详情
+     * @Description  个人中心-获取徽章认证页面详情 如果是未认证，则将居民base信息带出，如果是已认证，根据上次认证信息显示内容
      * @Param tokenDto
      * @Param certificationDetailFormDTO
      * @author zxc

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

@@ -21,6 +21,7 @@ import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.UserBadgeRedis;
+import com.epmet.redis.UserBaseInfoRedis;
 import com.epmet.service.UserBadgeService;
 import com.epmet.service.UserBaseInfoService;
 import com.epmet.util.ModuleConstant;
@@ -64,7 +65,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
-    private BadgeCertificationConfigDao badgeCertificationConfigDao;
+    private UserBaseInfoRedis userBaseInfoRedis;
     @Autowired
     private UserBadgeCertificateRecordDao userBadgeCertificateRecordDao;
 
@@ -333,10 +334,18 @@ public class UserBadgeServiceImpl implements UserBadgeService {
      */
     @Override
     public CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO) {
+        //工作端
         if (StringUtils.isNotBlank(certificationDetailFormDTO.getRecordId())){
             return userBadgeDao.selectBadgeAuthRecord(null, certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId());
         }
-        return userBadgeDao.selectBadgeAuthRecord(tokenDto.getUserId(), certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId());
+        //居民端
+        CertificationDetailResultDTO resiResult = userBadgeDao.selectBadgeAuthRecord(tokenDto.getUserId(), certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId());
+        if(null == resiResult){
+            UserBaseInfoResultDTO userInfo = userBaseInfoRedis.getUserInfo(tokenDto.getUserId());
+            resiResult = ConvertUtils.sourceToTarget(userInfo,CertificationDetailResultDTO.class);
+            if(null != resiResult) resiResult.setIdcard(userInfo.getIdNum());
+        }
+        return resiResult;
     }