王公峰：志愿者认证

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -22,7 +22,7 @@ import java.util.List;
  * 用户模块
  *
  * @author yujintao
- * @email yujintao@elink-cn.com
+ * @email yujintao@elink-cn.comuser/completeInfo
  * @date 2019/9/6 19:30
  */
 @RestController
@@ -264,4 +264,20 @@ public class ApiAppUserController {
     public Result checkWxUnionId(@LoginUser TokenDto tokenDto) {
         return appUserService.checkWxUnionId(tokenDto);
     }
+
+    /**
+     * 志愿者认证
+     *
+     * @param tokenDto
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author wanggongfeng
+     * @date 2019/12/13 14:41
+     */
+    @PostMapping("volunteer/authenticate")
+    public Result volunteerAuthenticate(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteUserInfoFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return appUserService.volunteerAuthenticate(tokenDto, formDto);
+
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -1,5 +1,6 @@
 package com.elink.esua.epdc.feign;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserDTO;
@@ -7,11 +8,14 @@ import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.UserWxFormIdDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
+import com.elink.esua.epdc.dto.form.EpdcCompleteUserInfoFormDTO;
 import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -326,4 +330,21 @@ public interface UserFeignClient {
      **/
     @PostMapping(value="app-user/epdc-app/user/queryUserDto", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO);
+
+    /**
+     * 志愿者认证
+     * @param userId
+     * @return
+     */
+    @GetMapping("app-user/epdc-app/user/getVolunteerCountById/{userId}")
+    Result<Integer> getVolunteerCountById(@PathVariable("userId") String userId);
+
+    /**
+     * 添加志愿者
+     * @param tokenDto
+     * @param formDto
+     * @return
+     */
+    @GetMapping("app-user/epdc-app/user/insertVolunteerInfo")
+    Result<Integer> insertVolunteerInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -1,5 +1,6 @@
 package com.elink.esua.epdc.feign.fallback;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -8,6 +9,7 @@ import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.UserWxFormIdDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
+import com.elink.esua.epdc.dto.form.EpdcCompleteUserInfoFormDTO;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -159,4 +161,14 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "queryUserDto",formDTO);
     }
+
+    @Override
+    public Result<Integer> getVolunteerCountById(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getVolunteerCountById", userId);
+    }
+
+    @Override
+    public Result<Integer> insertVolunteerInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "insertVolunteerInfo", tokenDto,formDto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -216,4 +216,16 @@ public interface AppUserService {
      * @Date 2019/12/7 14:32
      **/
 	Result checkWxUnionId(TokenDto tokenDto);
+
+    /**
+     * 志愿者认证
+     * @param tokenDto
+     * @param formDto
+     * @Author wanggongfeng
+     * @return
+     */
+    Result volunteerAuthenticate(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO formDto);
+
+
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -1045,4 +1045,24 @@ public class AppUserServiceImpl implements AppUserService {
         }
         return result;
     }
+
+    @Override
+    public Result volunteerAuthenticate(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO formDto) {
+        Boolean isVolunteer = true;
+        Result<Integer> volunteerCountResult = userFeignClient.getVolunteerCountById(tokenDto.getUserId());
+        if (!volunteerCountResult.success() || null == volunteerCountResult.getData()) {
+            throw new RenException("志愿者认证失败");
+        }else if(volunteerCountResult.getData() == 0){
+            isVolunteer = false;
+            Result<Integer> insertCountResult = userFeignClient.insertVolunteerInfo(tokenDto,formDto);
+        }
+
+        //用户完善个人信息-保存
+        Result<EpdcAppAuthorizationDTO> result = completeUserInfo(tokenDto, formDto);
+
+
+        return new Result().ok(isVolunteer);
+    }
+
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -353,4 +353,21 @@ public class EpdcAppUserController {
     public Result<EpdcUserRegisterInfoResultDTO> getUserLastSwitchGird(@PathVariable("openId") String openId) {
         return userService.getUserLastSwitchGird(openId);
     }
+
+    /**
+     * 根据用户id 进行志愿者认证
+     * @param userId
+     * @author wanggongfeng
+     * @return
+     */
+    @GetMapping("getVolunteerCountById/{userId}")
+    public Result<Integer> getVolunteerCountById(@PathVariable("userId") String userId) {
+        return userService.getVolunteerCountById(userId);
+    }
+
+    /*@GetMapping("insertVolunteerInfo")
+    public Result<Integer> insertVolunteerInfo(@RequestBody TokenDto tokenDto, @RequestBody EpdcCompleteUserInfoFormDTO formDto) {
+        //return userService.insertVolunteerInfo(fromDto);
+        return null;
+    }*/
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@@ -156,4 +156,6 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @Date 2019/12/7 11:23
      **/
     List<EpdcWorkUserResultDTO> selectPartyAuthenticationFailedList(EpdcWorkUserFromDTO workUserFromDto);
+
+    int getVolunteerCountById(@Param("userId") String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -267,4 +267,13 @@ public interface UserService extends BaseService<UserEntity> {
      * @Date 2019/12/13 15:10
      **/
     Result handleUserPoints(EpdcUserPointsFormDTO formDTO);
+
+    /**
+     * 根据用户id 进行志愿者认证
+     * @param userId
+     * @author wanggongfeng
+     * @return
+     * @Date 2019/12/13 16:39
+     */
+    Result<Integer> getVolunteerCountById(String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -806,4 +806,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return ConvertUtils.sourceToTarget(userEntity, UserDTO.class);
     }
 
+    @Override
+    public Result<Integer> getVolunteerCountById(String userId) {
+        return new Result<Integer>().ok(baseDao.getVolunteerCountById(userId));
+    }
+
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -352,4 +352,8 @@
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
+    <select id="getVolunteerCountById" resultType="Integer">
+        SELECT IFNULL(count(*),0) count FROM `epdc_volunteer_info` where del_flag = '0' and id = #{id}
+    </select>
+
 </mapper>