From 5d242ab0e408651bcfe1baf8512d2654abb30bdd Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 4 Apr 2023 10:46:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?/resi/mine/badge/operlist=EF=BC=8C=E5=B7=B2?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=9C=AA=E5=AE=A1=E6=A0=B8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84=EF=BC=8C"isCertificated":=20"no"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/UserBadgeServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
index 3154e8c774..d36bd4dcb9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
@@ -167,11 +167,11 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                     ub.setAuditStatus(StrConstant.EPMETY_STR);
                     ub.setIsCertificated(BadgeConstant.NO);
                 } else {
-                    //申请了
+                    //申请了，但是未通过的：rejected:审核驳回;auditing:审核中
                     ub.setIsReject(entity.getAuditStatus().equals(BadgeConstant.REJECTED));
                     ub.setIsLighted(BadgeConstant.NO);
                     ub.setAuditStatus(entity.getAuditStatus());
-                    ub.setIsCertificated(BadgeConstant.YES);
+                    ub.setIsCertificated(BadgeConstant.NO);
                 }
             }
 

From 0af33c7ad2dc6c5bf923262952257f09602d38a8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 4 Apr 2023 10:51:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=BE=BD=E7=AB=A0?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=EF=BC=8C=E4=B8=8D=E6=A0=A1=E9=AA=8C=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/CertificationAddFormDTO.java | 9 +++++----
 .../com/epmet/service/impl/UserBadgeServiceImpl.java     | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java
index 85ed907b4a..48365aa8a6 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java
@@ -60,10 +60,11 @@ public class CertificationAddFormDTO implements Serializable {
      */
     private String remark;
 
-    /**
-     * 验证码
-     */
-    private String code;
+    // 烟台不校验验证码
+    // /**
+    //  * 验证码
+    //  */
+    // private String code;
 
     /**
      * 是否需要发送站内信：
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
index d36bd4dcb9..faf959d7a7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
@@ -298,12 +298,13 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         authFieldFormDTO.setBadgeId(certificationAddFormDTO.getBadgeId());
 
         validateParams(certificationAddFormDTO, authFieldFormDTO);
-        if (StringUtils.isNotBlank(certificationAddFormDTO.getMobile())) {
+        //烟台不校验验证码
+        /*if (StringUtils.isNotBlank(certificationAddFormDTO.getMobile())) {
             String smsCode = userBadgeRedis.getBadgeSmsCode(certificationAddFormDTO.getMobile());
             if (!StringUtils.isNotBlank(smsCode)) {
                 return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
             }
-        }
+        }*/
         // 0309:如果是党员徽章去判断居民信息-类别是否是党员
         String auditRemark="";
         BadgeEntity badgeEntity = badgeDao.selectBadgeInfo(EpmetRequestHolder.getLoginUserCustomerId(),certificationAddFormDTO.getBadgeId());