Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center

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

@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.UserBadgeCertificateRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 用户认证徽章记录表
@@ -29,5 +30,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface UserBadgeCertificateRecordDao extends BaseDao<UserBadgeCertificateRecordEntity> {
-	
+
+    /**
+     * @Description  查询是否已存在记录
+     * @Param badgeId
+     * @Param userId
+     * @author zxc
+     * @date 2020/11/23 上午9:50
+     */
+    Integer selectIsExist(@Param("badgeId")String badgeId,@Param("userId")String userId);
+
 }

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

@@ -65,6 +65,8 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private BadgeCertificationConfigDao badgeCertificationConfigDao;
+    @Autowired
+    private UserBadgeCertificateRecordDao userBadgeCertificateRecordDao;
 
     /**
      * @Description 查询已经点亮的徽章
@@ -84,6 +86,8 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){
             return redisUserBadgeList.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList());
         }
+        List<UserBadgeListResultDTO> result = new ArrayList<>();
+        result.addAll(userBadgeListResultDTOS);
         redisUserBadgeList.forEach(u -> {
             userBadgeListResultDTOS.forEach(badge -> {
                 if (u.getBadgeId().equals(badge.getBadgeId())){
@@ -93,7 +97,13 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                 }
             });
         });
-        return redisUserBadgeList.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getStatus,Comparator.reverseOrder()).thenComparing(UserBadgeListResultDTO::getUpdatedTime,Comparator.reverseOrder()).thenComparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList());
+        Map<Boolean, List<UserBadgeListResultDTO>> collect = redisUserBadgeList.stream().collect(Collectors.groupingBy(UserBadgeListResultDTO::getStatus));
+        List<UserBadgeListResultDTO> noIsLight = collect.get(false);
+        if (CollectionUtils.isEmpty(noIsLight)){
+            return result;
+        }
+        result.addAll(noIsLight.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList()));
+        return result;
     }
 
     /**
@@ -233,6 +243,10 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result authBadgeRecord(CertificationAddFormDTO certificationAddFormDTO) {
+        Integer recordCount = userBadgeCertificateRecordDao.selectIsExist(certificationAddFormDTO.getBadgeId(), certificationAddFormDTO.getUserId());
+        if (recordCount>NumConstant.ZERO){
+            throw new RenException("不允许重复提交审核");
+        }
         log.info(JSON.toJSONString(certificationAddFormDTO));
         AuthFieldFormDTO authFieldFormDTO = new AuthFieldFormDTO();
         authFieldFormDTO.setCustomerId(certificationAddFormDTO.getCustomerId());

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

@@ -28,5 +28,17 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 查询是否已存在记录 -->
+    <select id="selectIsExist" resultType="java.lang.Integer">
+        SELECT
+            COUNT(id)
+        FROM user_badge_certificate_record
+        WHERE DEL_FLAG = 0
+          AND USER_ID = #{userId}
+          AND BADGE_ID = #{badgeId}
+          AND IS_LAST = 'yes'
+          AND (AUDIT_STATUS = 'approved' OR AUDIT_STATUS = 'auditing')
+    </select>
+
 
 </mapper>