From 44ca62d28c33cb2b57d8653022ec614ac9a8397c Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Fri, 7 Feb 2020 17:51:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AFForDTO=E4=B8=AD=E7=9A=84wxC?=
 =?UTF-8?q?ode=E8=AE=BE=E4=B8=BA=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 5 ++++-
 .../epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index b2883c48f..8d8e9c69f 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -49,6 +49,8 @@ import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -70,7 +72,7 @@ import java.util.List;
 @Slf4j
 @Service
 public class AppUserServiceImpl implements AppUserService {
-
+    private static final Logger logger = LoggerFactory.getLogger(AppUserServiceImpl.class);
     @Autowired
     private AppUserRedis appUserRedis;
 
@@ -1097,6 +1099,7 @@ public class AppUserServiceImpl implements AppUserService {
      */
     @Override
     public Result volunteerAuthenticate(TokenDto tokenDto, EpdcCompleteVolunteerInfoFormDTO formDto) {
+        logger.info("志愿者认证wxCode="+formDto.getWxCode()+";userId="+tokenDto.getUserId());
         String sex = IdentityNoAnalysisUtil.getSex(formDto.getIdentityNo());         // 身份证解析性别
         if (sex.equals("女")){
             sex = "0";
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java
index aa350cfbc..4206b6463 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java
@@ -67,6 +67,7 @@ public class EpdcCompleteVolunteerInfoFormDTO implements Serializable {
     /**
      * 微信code
      */
+    @NotBlank(message = "微信code不能为空")
     private String wxCode;
 
     /**