徽章认证详情

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserBadgeCertificateRecordDTO.java

@@ -20,6 +20,7 @@ public class UserBadgeCertificateRecordDTO implements Serializable {
     private String badgeId;
     private String surname;
     private String name;
+    private String mobile;
     private String idNum;
     private String certificationImg;
     private String remark;

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

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/4 3:51 下午
+ */
+@Data
+public class CertificationDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -398879254354767770L;
+
+    public interface CertificationDetail{}
+
+    @NotBlank(message = "客户ID不能为空",groups = {CertificationDetail.class})
+    private String customerId;
+
+    @NotBlank(message = "徽章ID不能为空",groups = {CertificationDetail.class})
+    private String badgeId;
+
+    /**
+     * 客户ID
+     */
+    private String userId;
+}

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

@@ -0,0 +1,60 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/4 3:51 下午
+ */
+@Data
+public class CertificationDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 6538150132908927308L;
+
+    /**
+     * 姓
+     */
+    private String surname;
+
+    /**
+     * 名
+     */
+    private String name;
+
+    /**
+     * 身份证号
+     */
+    private String idNum;
+
+    /**
+     * 是否认证 yes 认证 no 已认证
+     */
+    private String isCertificated;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 认证图片地址
+     */
+    private String certificationImg;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 审核结果
+     */
+    private String authResult;
+
+    /**
+     * 驳回原因
+     */
+    private String authReason;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -344,7 +344,7 @@ public interface EpmetUserOpenFeignClient {
      * @author zxc
      * @date 2020/11/3 1:33 下午
      */
-    @PostMapping("/epmetuser/badge/badgelist")
+    @PostMapping("/epmetuser/more/badge/badgelist")
     Result<List<UserBadgeListResultDTO>> selectBadgeList(@RequestBody UserBadgeListFormDTO userBadgeListFormDTO);
 
     /**
@@ -353,9 +353,15 @@ public interface EpmetUserOpenFeignClient {
      * @author zxc
      * @date 2020/11/3 4:28 下午
      */
-    @PostMapping("/epmetuser/badge/badgeoperlist")
+    @PostMapping("/epmetuser/more/badge/badgeoperlist")
     Result<List<UserOperListResultDTO>> selectOperList(@RequestBody UserOperListFormDTO userOperListFormDTO);
 
-    @PostMapping("/epmetuser/badge/authbadgerecord")
+    /**
+     * @Description  徽章认证提交
+     * @Param certificationAddFormDTO
+     * @author zxc
+     * @date 2020/11/4 4:30 下午
+     */
+    @PostMapping("/epmetuser/more/badge/authbadgerecord")
     Result authBadgeRecord(@RequestBody CertificationAddFormDTO certificationAddFormDTO);
 }

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

@@ -1,11 +1,11 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.BadgeSendCodeFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.CertificationAddFormDTO;
+import com.epmet.dto.result.CertificationDetailResultDTO;
-import com.epmet.dto.form.UserBadgeListFormDTO;
-import com.epmet.dto.form.UserOperListFormDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
 import com.epmet.dto.result.UserOperListResultDTO;
 import com.epmet.service.UserBadgeService;
@@ -22,7 +22,7 @@ import java.util.List;
  * @DateTime 2020/11/3 11:16 上午
  */
 @RestController
-@RequestMapping("badge")
+@RequestMapping("more/badge")
 public class UserBadgeController {
 
     @Autowired
@@ -75,4 +75,17 @@ public class UserBadgeController {
         return new Result();
     }
 
+    /**
+     * @Description  个人中心-获取徽章认证页面详情
+     * @Param tokenDto
+     * @Param certificationDetailFormDTO
+     * @author zxc
+     * @date 2020/11/4 4:03 下午
+     */
+    @PostMapping("certification/detail")
+    public Result<CertificationDetailResultDTO> certificationDetail(@LoginUser TokenDto tokenDto,@RequestBody CertificationDetailFormDTO certificationDetailFormDTO){
+        ValidatorUtils.validateEntity(certificationDetailFormDTO);
+        return new Result<CertificationDetailResultDTO>().ok(userBadgeService.certificationDetail(tokenDto,certificationDetailFormDTO));
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java

@@ -2,6 +2,7 @@ package com.epmet.dao;
 
 import com.epmet.dto.UserBadgeCertificateRecordDTO;
 import com.epmet.dto.form.UserBadgeListFormDTO;
+import com.epmet.dto.result.CertificationDetailResultDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
 import com.epmet.dto.result.UserOperListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -65,4 +66,12 @@ public interface UserBadgeDao {
      */
     void updateCertificateRecordIsLast(@Param("badgeId")String badgeId,@Param("userId")String userId);
 
+    /**
+     * @Description  查询单个徽章的认证记录
+     * @Param userId
+     * @Param badgeId
+     * @author zxc
+     * @date 2020/11/4 4:09 下午
+     */
+    CertificationDetailResultDTO selectBadgeAuthRecord(@Param("userId")String userId, @Param("badgeId")String badgeId);
 }

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

@@ -1,10 +1,10 @@
 package com.epmet.service;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.BadgeSendCodeFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.CertificationAddFormDTO;
+import com.epmet.dto.result.CertificationDetailResultDTO;
-import com.epmet.dto.form.UserBadgeListFormDTO;
-import com.epmet.dto.form.UserOperListFormDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
 import com.epmet.dto.result.UserOperListResultDTO;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -49,4 +49,13 @@ public interface UserBadgeService {
      */
     void badgeSendCode(BadgeSendCodeFormDTO badgeSendCodeFormDTO);
 
+    /**
+     * @Description  个人中心-获取徽章认证页面详情
+     * @Param tokenDto
+     * @Param certificationDetailFormDTO
+     * @author zxc
+     * @date 2020/11/4 4:03 下午
+     */
+    CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO);
+
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.PhoneValidatorUtils;
@@ -12,10 +13,7 @@ import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.dao.UserBadgeDao;
 import com.epmet.dto.UserBadgeCertificateRecordDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.SendVerificationCodeResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.UserBadgeListResultDTO;
-import com.epmet.dto.result.UserBaseInfoResultDTO;
-import com.epmet.dto.result.UserOperListResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.redis.UserBadgeRedis;
 import com.epmet.service.CustomerStaffService;
@@ -198,4 +196,17 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         log.info(String.format("发送短信验证码成功,手机号[%s]", badgeSendCodeFormDTO.getMobile()));
     }
 
+    /**
+     * @Description  个人中心-获取徽章认证页面详情
+     * @Param tokenDto
+     * @Param certificationDetailFormDTO
+     * @author zxc
+     * @date 2020/11/4 4:03 下午
+     */
+    @Override
+    public CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO) {
+        certificationDetailFormDTO.setUserId(tokenDto.getUserId());
+        return userBadgeDao.selectBadgeAuthRecord(certificationDetailFormDTO.getUserId(), certificationDetailFormDTO.getBadgeId());
+    }
+
 }

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

@@ -67,6 +67,31 @@
             AND USER_ID = #{userId}
     </select>
 
+    <!-- 查询单个徽章的认证记录 -->
+    <select id="selectBadgeAuthRecord" resultType="com.epmet.dto.result.CertificationDetailResultDTO">
+        SELECT
+            SURNAME,
+            NAME,
+            ID_NUM,
+            ( CASE WHEN AUDIT_STATUS = 'approved' THEN 'yes' ELSE 'no' END ) AS isCertificated,
+            MOBILE,
+            CERTIFICATION_IMG,
+            REMAEK AS remark,
+            CUSTOMER_ID,
+            BADGE_ID,
+            CERTIFICATION_IMG,
+            AUDIT_STATUS,
+            AUDIT_STATUS AS authResult,
+            AUDIT_REMARK AS authReason
+        FROM
+            user_badge_certificate_record
+        WHERE
+            DEL_FLAG = 0
+            AND IS_LAST = 'yes'
+            AND BADGE_ID = #{badgeId}
+            AND USER_ID = #{userId}
+    </select>
+
     <!--  徽章审核记录表插入  -->
     <insert id="insertUserBadgeCertificateRecord">
         INSERT INTO user_badge_certificate_record (
@@ -77,6 +102,7 @@
             BADGE_ID,
             SURNAME,
             NAME,
+            MOBILE,
             ID_NUM,
             CERTIFICATION_IMG,
             REMAEK,
@@ -101,6 +127,7 @@
             #{badgeId},
             #{surname},
             #{name},
+            #{mobile},
             #{idNum},
             #{certificationImg},
             #{remark},