徽章

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

@@ -43,4 +43,9 @@ public class OperListResultDTO implements Serializable {
      */
     private Boolean isReject;
 
+    /**
+     * 徽章类型：党员徽章；party，无：none
+     */
+    private String badgeType;
+
 }

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

@@ -22,4 +22,6 @@ public interface BadgeConstant {
 
     String NONE ="none";
 
+    String SMS_CODE_KEY = "epmet:smsCode:badge:";
+
 }

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

@@ -44,6 +44,11 @@ public class UserOperListResultDTO implements Serializable {
      */
     private Boolean isReject;
 
+    /**
+     * 徽章类型：党员徽章；party，无：none
+     */
+    private String badgeType;
+
     @JsonIgnore
     private String customerId;
     @JsonIgnore

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java

@@ -27,7 +27,7 @@ public class UserBadgeRedis {
      * @author zxc
      * @date 2020/11/3 2:50 下午
      */
-    public Object getUserBadge(String customerId){
+    public Object getCustomerBadge(String customerId){
         Object userBadge = redisUtils.hGet(BadgeConstant.BADGE_KEY + customerId, BadgeConstant.BADGE);
         return userBadge;
     }
@@ -39,17 +39,29 @@ public class UserBadgeRedis {
      * @author zxc
      * @date 2020/11/3 2:51 下午
      */
-    public void setUserBadge(List<UserBadgeListResultDTO> userBadge,String customerId){
+    public void setCustomerBadge(List<UserBadgeListResultDTO> userBadge, String customerId){
         redisUtils.hSet(BadgeConstant.BADGE_KEY+customerId,BadgeConstant.BADGE, JSON.toJSON(userBadge).toString(),-1);
     }
 
+    /**
+     * @Description  存放徽章审核 手机验证码
+     * @Param mobile
+     * @author zxc
+     * @date 2020/11/5 10:30 上午
+     */
     public void saveBadgeSmsCode(String mobile, String smsCode) {
-        String smsCodeKey = "epmet:smsCode:badge:" + mobile;
+        String smsCodeKey = BadgeConstant.SMS_CODE_KEY + mobile;
         redisUtils.set(smsCodeKey, smsCode, MINUTE_THIRTY_EXPIRE);
     }
 
+    /**
+     * @Description  获取徽章审核 手机验证码
+     * @Param mobile
+     * @author zxc
+     * @date 2020/11/5 10:30 上午
+     */
     public String getBadgeSmsCode(String mobile) {
-        String smsCodeKey = "epmet:smsCode:badge:" + mobile;
+        String smsCodeKey = BadgeConstant.SMS_CODE_KEY + mobile;
         String smsCode = (String) redisUtils.get(smsCodeKey);
         return smsCode;
     }

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

@@ -56,7 +56,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
      */
     @Override
     public List<UserBadgeListResultDTO> selectBadgeList(UserBadgeListFormDTO userBadgeListFormDTO) {
-        Object userBadge = userBadgeRedis.getUserBadge(userBadgeListFormDTO.getCustomerId());
+        Object userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
         if (null == userBadge){
             List<UserBadgeListResultDTO> resultUserBadge = new ArrayList<>();
             List<UserBadgeListResultDTO> userBadgeListResultDTOS = userBadgeDao.selectAllBadge(userBadgeListFormDTO);
@@ -71,8 +71,8 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                         }
                     });
                 });
-                userBadgeRedis.setUserBadge(resultUserBadge,userBadgeListFormDTO.getCustomerId());
+                userBadgeRedis.setCustomerBadge(resultUserBadge,userBadgeListFormDTO.getCustomerId());
-                userBadge = userBadgeRedis.getUserBadge(userBadgeListFormDTO.getCustomerId());
+                userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
             }
         }
         List<UserBadgeListResultDTO> redisUserBadgeList = JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class);
@@ -105,7 +105,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     @Override
     public List<UserOperListResultDTO> selectOperList(UserOperListFormDTO userOperListFormDTO) {
         List<UserOperListResultDTO> userAuthBadgeList = userBadgeDao.selectAuthRecord(userOperListFormDTO.getUserId());
-        Object userBadge = userBadgeRedis.getUserBadge(userOperListFormDTO.getCustomerId());
+        Object userBadge = userBadgeRedis.getCustomerBadge(userOperListFormDTO.getCustomerId());
         List<UserOperListResultDTO> userOperListResultDTOS = JSON.parseArray(userBadge.toString(), UserOperListResultDTO.class);
         // 没有任何记录
         if (CollectionUtils.isEmpty(userAuthBadgeList)){