徽章认证提交

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/controller/BadgeController.java

@@ -64,8 +64,7 @@ public class BadgeController {
     @PostMapping("certification/add")
     public Result certificationAdd(@LoginUser TokenDto tokenDto,@RequestBody CertificationAddFormDTO certificationAddFormDTO){
         ValidatorUtils.validateEntity(certificationAddFormDTO, CertificationAddFormDTO.CertificationAdd.class);
-        badgeService.certificationAdd(tokenDto,certificationAddFormDTO);
+        return badgeService.certificationAdd(tokenDto,certificationAddFormDTO);
-        return new Result();
     }
 
     /**

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/service/BadgeService.java

@@ -1,6 +1,7 @@
 package com.epmet.modules.badege.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.OpenedOrClosedFormDTO;
 import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
 import com.epmet.dto.form.CertificationAddFormDTO;
@@ -39,7 +40,7 @@ public interface BadgeService {
      * @author zxc
      * @date 2020/11/4 11:16 上午
      */
-    void certificationAdd(TokenDto tokenDto, CertificationAddFormDTO certificationAddFormDTO);
+    Result certificationAdd(TokenDto tokenDto, CertificationAddFormDTO certificationAddFormDTO);
 
     /**
      * @Description 个人中心-取消/点亮徽章

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

@@ -86,12 +86,10 @@ public class BadgeServiceImpl implements BadgeService {
      * @date 2020/11/4 11:16 上午
      */
     @Override
-    public void certificationAdd(TokenDto tokenDto, CertificationAddFormDTO certificationAddFormDTO) {
+    public Result certificationAdd(TokenDto tokenDto, CertificationAddFormDTO certificationAddFormDTO) {
         certificationAddFormDTO.setUserId(tokenDto.getUserId());
         Result result = epmetUserOpenFeignClient.authBadgeRecord(certificationAddFormDTO);
-        if (!result.success()){
+        return result;
-            throw new RenException("提交徽章认证失败......");
-        }
     }
 
     /**

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

@@ -37,7 +37,7 @@ public class CertificationAddFormDTO implements Serializable {
     /**
      * 姓
      */
-    private String subName;
+    private String surname;
 
     /**
      * 名
@@ -52,7 +52,7 @@ public class CertificationAddFormDTO implements Serializable {
     /**
      * 认证证件图片url
      */
-    private String certificate;
+    private String certificationImg;
 
     /**
      * 认证说明

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java

@@ -26,7 +26,7 @@ public class CertificationDetailResultDTO implements Serializable {
     /**
      * 身份证号
      */
-    private String idNum;
+    private String idCard;
 
     /**
      * 是否认证 yes 认证 no 已认证

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

@@ -59,8 +59,7 @@ public class UserBadgeController {
      */
     @PostMapping("authbadgerecord")
     public Result authBadgeRecord(@RequestBody CertificationAddFormDTO certificationAddFormDTO){
-        userBadgeService.authBadgeRecord(certificationAddFormDTO);
+        return userBadgeService.authBadgeRecord(certificationAddFormDTO);
-        return new Result();
     }
 
     /**

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

@@ -148,8 +148,8 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         userBadgeDao.updateCertificateRecordIsLast(form.getBadgeId(),form.getUserId());
         form.setGridId(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRegisteredGridId());
         form.setIdNum(certificationAddFormDTO.getIdCard());
-        form.setCertificationImg(certificationAddFormDTO.getCertificate());
+        form.setCertificationImg(certificationAddFormDTO.getCertificationImg());
-        form.setSurname(certificationAddFormDTO.getSubName());
+        form.setSurname(certificationAddFormDTO.getSurname());
         userBadgeDao.insertUserBadgeCertificateRecord(form);
         return new Result();
     }

epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml

@@ -89,7 +89,7 @@
         SELECT
             SURNAME,
             NAME,
-            ID_NUM,
+            ID_NUM AS idCard,
             ( CASE WHEN AUDIT_STATUS = 'approved' THEN 'yes' ELSE 'no' END ) AS isCertificated,
             MOBILE,
             CERTIFICATION_IMG,