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

epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java

@@ -6,7 +6,7 @@ package com.epmet.constant;
  */
 public interface BadgeConstant {
 
-    String BADGE_KEY = "epmet:badge:";
+    String BADGE_KEY = "epmet:badge:customer:";
 
     String BADGE = "badge";
 

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

@@ -57,4 +57,9 @@ public class CertificationDetailResultDTO implements Serializable {
      * 驳回原因
      */
     private String authReason;
+
+    /**
+     * 审核记录ID
+     */
+    private String recordId;
 }

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

@@ -64,15 +64,20 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                 Map<String, List<UserBadgeListResultDTO>> groupByCustomer = userBadgeListResultDTOS.stream().collect(Collectors.groupingBy(UserBadgeListResultDTO::getCustomerId));
                 resultUserBadge.addAll(groupByCustomer.get(BadgeConstant.DEFAULT_CUSTOMER));
                 List<UserBadgeListResultDTO> badgeByCustomer = groupByCustomer.get(userBadgeListFormDTO.getCustomerId());
-                resultUserBadge.forEach(r -> {
-                    badgeByCustomer.forEach(b -> {
-                        if (r.getBadgeId().equals(b.getBadgeId())){
-                            BeanUtils.copyProperties(b,r);
-                        }
+                if (!CollectionUtils.isEmpty(badgeByCustomer)) {
+                    resultUserBadge.forEach(r -> {
+                        badgeByCustomer.forEach(b -> {
+                            if (r.getBadgeId().equals(b.getBadgeId())) {
+                                BeanUtils.copyProperties(b, r);
+                            }
+                        });
                     });
-                });
-                userBadgeRedis.setCustomerBadge(resultUserBadge,userBadgeListFormDTO.getCustomerId());
-                userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
+                    userBadgeRedis.setCustomerBadge(resultUserBadge, userBadgeListFormDTO.getCustomerId());
+                    userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
+                }else {
+                    userBadgeRedis.setCustomerBadge(resultUserBadge, userBadgeListFormDTO.getCustomerId());
+                    userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
+                }
             }
         }
         List<UserBadgeListResultDTO> redisUserBadgeList = JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class);

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

@@ -34,6 +34,7 @@
             AND b.DEL_FLAG = 0
             AND ub.CERTIFICATION_AUTID_STATUS = 'pass'
             AND b.CUSTOMER_ID = 'default'
+            AND b.BADGE_STATUS = 'online'
             AND ub.USER_ID = #{userId}
             ORDER BY ub.UPDATED_TIME DESC
     </select>
@@ -49,7 +50,8 @@
         FROM badge
         WHERE
             DEL_FLAG = '0'
-            AND (CUSTOMER_ID = 'default' OR CUSTOMER_ID = 'zxc')
+            AND (CUSTOMER_ID = 'default' OR CUSTOMER_ID = #{customerId})
+            AND BADGE_STATUS = 'online'
     </select>
 
     <!-- 查询徽章认证记录 -->
@@ -92,7 +94,8 @@
             CERTIFICATION_IMG,
             AUDIT_STATUS,
             AUDIT_STATUS AS authResult,
-            AUDIT_REMARK AS authReason
+            AUDIT_REMARK AS authReason,
+            ID AS recordId
         FROM
             user_badge_certificate_record
         WHERE