王公峰：报名活动、取消报名接口

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java

@@ -22,6 +22,7 @@ public class EpdcCompleteUserInfoFormDTO implements Serializable {
     /**
      * 身份证号码
      */
+    @NotBlank(message = "身份证号码不能为空")
     private String identityNo;
     /**
      * 手机号

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

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2019/12/17 10:30
  */
 @RestController
-@RequestMapping("heart")
+@RequestMapping("heart/phrase")
 public class ApiActPhraseController {
 
     @Autowired
@@ -28,7 +28,7 @@ public class ApiActPhraseController {
      * @author wanggongfeng    @LoginUser TokenDto tokenDto,
      * @date 2019/12/13 14:41
      */
-    @GetMapping("phrase/sagenumAddOne/{id}")
+    @GetMapping("sagenumAddOne/{id}")
     public Result sagenumAddOneById(@PathVariable("id") String id) {
         return actPhraseService.sagenumAddOneById(id);
     }
@@ -39,7 +39,7 @@ public class ApiActPhraseController {
      * @author wanggongfeng
      * @date 2019/12/13 14:41
      */
-    @GetMapping("phrase/getPhraseList")
+    @GetMapping("getPhraseList")
     public Result getPhraseList() {
         return actPhraseService.getPhraseList();
 

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

@@ -5,13 +5,12 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.util.IdentityNoAnalysisUtil;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.service.ActUserRelationService;
 import com.elink.esua.epdc.service.AppUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+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.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -24,7 +23,7 @@ import java.util.Date;
  * @date 2019/12/17 10:30
  */
 @RestController
-@RequestMapping("heart")
+@RequestMapping("heart/act")
 public class ApiActUserRelationController {
 
     @Autowired
@@ -42,10 +41,8 @@ public class ApiActUserRelationController {
      * @author wanggongfeng
      * @date 2019/12/13 14:41
      */
-    @PostMapping("act/signup")
+    @GetMapping("signup")
     public Result activitySignUp(@LoginUser TokenDto tokenDto, @PathVariable("actId") String actId) {
-        ValidatorUtils.validateEntity(actId);
-
         //验证是否为志愿者
         Result isVolunteer = appUserService.getVolunteerCountById(tokenDto);
         int code = isVolunteer.getCode();
@@ -70,6 +67,19 @@ public class ApiActUserRelationController {
         actUserRelationDTO.setIdentityNo(identityNo);
         actUserRelationDTO.setStatus("0");
         actUserRelationDTO.setSignupTime(new Date());
+        /*ActUserRelationDTO actUserRelationDTO = new ActUserRelationDTO();
+        actUserRelationDTO.setActId("122");
+        actUserRelationDTO.setUserId("3f6448adbfbe736dde333f057a956012");
+        actUserRelationDTO.setNickname("南宁路-安女士");
+        actUserRelationDTO.setFaceImg("https://wx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTJpzm5C5QcVeGoUJoy6ic5VTsJCsgPhdhibmicV3WrlCVXSOumKhWhdibymIA7tkdJzzbWB72CkWibic30w/132");
+        actUserRelationDTO.setPartyFlag("0");
+        actUserRelationDTO.setRealName("安然");
+        actUserRelationDTO.setSex("0");
+        actUserRelationDTO.setAge(39);
+        actUserRelationDTO.setMobile("17554179541");
+        actUserRelationDTO.setIdentityNo("61050219890208382X");
+        actUserRelationDTO.setStatus("0");
+        actUserRelationDTO.setSignupTime(new Date());*/
         return actUserRelationService.activitySignUp(actUserRelationDTO);
 
     }
@@ -83,10 +93,8 @@ public class ApiActUserRelationController {
      * @author wanggongfeng
      * @date 2019/12/13 14:41
      */
-    @PostMapping("act/cancelsignup")
-    public Result activityCancelSignUp(@LoginUser TokenDto tokenDto, @PathVariable("actId") String actId) {
-        ValidatorUtils.validateEntity(actId);
-
+    @GetMapping("cancelsignup")
+    public Result activityCancelSignUp(@LoginUser TokenDto tokenDto,@PathVariable("actId") String actId) {
         return actUserRelationService.activityCancelSignUp(tokenDto.getUserId(),actId);
 
     }

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.PathVariable;
  * @Author：wanggongfeng
  * @Date：2019/12/16 17:36
  */
-@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppActPhraseFeignClientFallback.class,url = "http://127.0.0.1:9060")
+@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppActPhraseFeignClientFallback.class)
 public interface AppActPhraseFeignClient {
 
     /**

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

@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.feign.fallback.AppActUserRelationFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 
@@ -15,7 +16,7 @@ import org.springframework.web.bind.annotation.PathVariable;
  * @Author：wanggongfeng
  * @Date：2019/12/16 17:36
  */
-@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppActUserRelationFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppActUserRelationFeignClientFallback.class,url = "http://127.0.0.1:9060")
 public interface AppActUserRelationFeignClient {
 
     /**
@@ -24,7 +25,7 @@ public interface AppActUserRelationFeignClient {
      * @param actUserRelationDTO
      * @return
      */
-    @GetMapping("heart/appactuserrelation/activitySignUp")
+    @GetMapping(value = "heart/appactuserrelation/activitySignUp",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result activitySignUp(ActUserRelationDTO actUserRelationDTO);
 
     /**

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

@@ -5,6 +5,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.elink.esua.epdc.async.GroupTask;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;
+import com.elink.esua.epdc.common.token.util.IdentityNoAnalysisUtil;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.UserSexEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
@@ -15,20 +16,22 @@ import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
 import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
 import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
-import com.elink.esua.epdc.enums.*;
+import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
+import com.elink.esua.epdc.enums.AppUserRegisterSourceEnum;
+import com.elink.esua.epdc.enums.AppUserRegisterWayEnum;
+import com.elink.esua.epdc.enums.AppUserStatesEnum;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.OssFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
@@ -1068,8 +1071,10 @@ public class AppUserServiceImpl implements AppUserService {
         }
 
         //用户完善个人信息-保存
-        EpdcCompleteUserInfoFormDTO formDto2 = new EpdcCompleteUserInfoFormDTO();
-        Result<EpdcAppAuthorizationDTO> result = completeUserInfo(tokenDto, formDto2);
+        EpdcCompleteUserInfoFormDTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormDTO.class);
+        String sex = IdentityNoAnalysisUtil.getSex(formDto.getIdentityNo());//身份证解析性别
+        epdcCompleteUserInfoFormDTO.setSex(sex);
+        Result<EpdcAppAuthorizationDTO> result = completeUserInfo(tokenDto, epdcCompleteUserInfoFormDTO);
 
 
         return new Result().ok(isVolunteer);

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java

@@ -21,9 +21,7 @@ import com.elink.esua.epdc.activity.ActUserRelationDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.modules.activity.service.ActUserRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 用户活动关系表
@@ -44,7 +42,7 @@ public class AppActUserRelationController {
      * @return
      */
     @GetMapping("activitySignUp")
-    public Result activitySignUp(ActUserRelationDTO actUserRelationDTO){
+    public Result activitySignUp(@RequestBody ActUserRelationDTO actUserRelationDTO){
         return actUserRelationService.activitySignUp(actUserRelationDTO);
     }
 
@@ -54,7 +52,7 @@ public class AppActUserRelationController {
      * @return
      */
     @GetMapping("activityCancelSignUp/{userId}/{actId}")
-    public Result activityCancelSignUp(String userId,String actId){
+    public Result activityCancelSignUp(@PathVariable("userId")String userId, @PathVariable("actId")String actId){
         return actUserRelationService.activityCancelSignUp(userId,actId);
     }
 

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java

@@ -138,7 +138,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
 
         //查询是否已报名
         Result<ActUserRelationDTO> data = baseDao.selectOneActUserRelationInfo(userId,actId);
-        if(data.getData() != null){
+        if(data != null){
             ActUserRelationDTO actUserRelationDTO = data.getData();
             //已报名该活动，进行取消报名
             //更新活动人员关系表

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

@@ -148,7 +148,7 @@
     </update>
 
     <select id="getVolunteerCountById" resultType="Integer">
-        SELECT IFNULL(count(*),0) count FROM `epdc_volunteer_info` where del_flag = '0' and id = #{id}
+        SELECT IFNULL(count(*),0) count FROM `epdc_volunteer_info` where del_flag = '0' and id = #{id} and AUDIT_STATUS = '1'
     </select>
 
     <select id="selectAdjustVolunteerPointsDTO" parameterType="java.lang.String" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO">