取消报名接口添加“取消原因”

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

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 取消报名参数
+ *
+ * @author wanggongfeng
+ * @since v1.0.0 2019-12-17
+ */
+@Data
+public class EpdcAppActUserCancelsignupDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+    /**
+     * 活动ID
+     */
+	private String actId;
+    /**
+     * 取消报名原因
+     */
+    private String failureReason;
+}

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

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
 import com.elink.esua.epdc.activity.AppClockListDTO;
 import com.elink.esua.epdc.activity.result.AppActInfoDTO;
@@ -12,6 +13,7 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppActUserCancelsignupDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppActUserClockLogDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppClockListDTO;
 import com.elink.esua.epdc.service.ActUserRelationService;
@@ -84,15 +86,16 @@ public class ApiActUserRelationController {
      * 取消活动报名
      *
      * @param tokenDto
-     * @param actId
+     * @param epdcAppActUserCancelsignupDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author wanggongfeng
      * @date 2019/12/13 14:41
      */
     @PostMapping("cancelsignup")
-    public Result activityCancelSignUp(@LoginUser TokenDto tokenDto,String actId) {
+    public Result activityCancelSignUp(@LoginUser TokenDto tokenDto,@RequestBody EpdcAppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) {
-        return actUserRelationService.activityCancelSignUp(tokenDto.getUserId(),actId);
+        epdcAppActUserCancelsignupDTO.setUserId(tokenDto.getUserId());
-        //return actUserRelationService.activityCancelSignUp("0598a2e20eb2466ef0ebb42e930f3801",actId);
+        AppActUserCancelsignupDTO actUserCancelsignupDTO = ConvertUtils.sourceToTarget(epdcAppActUserCancelsignupDTO, AppActUserCancelsignupDTO.class);
+        return actUserRelationService.activityCancelSignUp(actUserCancelsignupDTO);
 
     }
 

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

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
 import com.elink.esua.epdc.activity.AppClockListDTO;
 import com.elink.esua.epdc.activity.result.AppActInfoDTO;
@@ -32,11 +33,11 @@ public interface AppActUserRelationFeignClient {
 
     /**
      * 取消活动报名
-     * @param actId
+     * @param epdcAppActUserCancelsignupDTO
      * @return
      */
-    @GetMapping("heart/appactuserrelation/activityCancelSignUp/{userId}/{actId}")
+    @GetMapping("heart/appactuserrelation/activityCancelSignUp")
-    Result activityCancelSignUp(@PathVariable("userId") String userId,@PathVariable("actId") String actId);
+    Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO);
 
     /**
      * 活动打卡

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

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.feign.fallback;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
 import com.elink.esua.epdc.activity.result.AppActInfoDTO;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
@@ -21,8 +22,8 @@ public class AppActUserRelationFeignClientFallback implements AppActUserRelation
         return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activitySignUp", actUserRelationDTO);
     }
     @Override
-    public Result activityCancelSignUp(String userId,String actId) {
+    public Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activityCancelSignUp", userId,actId);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activityCancelSignUp", epdcAppActUserCancelsignupDTO);
     }
 
     @Override

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

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
 import com.elink.esua.epdc.activity.AppClockListDTO;
 import com.elink.esua.epdc.activity.result.AppActInfoDTO;
@@ -22,12 +23,11 @@ public interface ActUserRelationService {
 
     /**
      * 取消活动报名
-     * @param actId
+     * @param epdcAppActUserCancelsignupDTO
-     * @param userId
      * @Author wanggongfeng
      * @return
      */
-    Result activityCancelSignUp(String userId,String actId);
+    Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO);
 
     /**
      * 活动打卡

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

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
 import com.elink.esua.epdc.activity.AppClockListDTO;
 import com.elink.esua.epdc.activity.result.AppActInfoDTO;
@@ -30,8 +31,8 @@ public class ActUserRelationServiceImpl implements ActUserRelationService {
     }
 
     @Override
-    public Result activityCancelSignUp(String userId,String actId) {
+    public Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) {
-        Result<Integer> dataResult = actInfoFeignClient.activityCancelSignUp(userId,actId);
+        Result<Integer> dataResult = actInfoFeignClient.activityCancelSignUp(epdcAppActUserCancelsignupDTO);
         return dataResult;
     }
 

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.activity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 取消报名参数
+ *
+ * @author wanggongfeng
+ * @since v1.0.0 2019-12-17
+ */
+@Data
+public class AppActUserCancelsignupDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+    /**
+     * 活动ID
+     */
+	private String actId;
+    /**
+     * 取消报名原因
+     */
+    private String failureReason;
+}

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

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.activity.controller;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppClockListDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.modules.activity.service.ActUserRelationService;
@@ -49,12 +50,13 @@ public class AppActUserRelationController {
 
     /**
      * 取消活动报名
-     * @param actId
+     * @param appActUserCancelsignupDTO
      * @return
      */
-    @GetMapping("activityCancelSignUp/{userId}/{actId}")
+    @GetMapping("activityCancelSignUp")
-    public Result activityCancelSignUp(@PathVariable("userId")String userId, @PathVariable("actId")String actId){
+    public Result activityCancelSignUp(@RequestBody AppActUserCancelsignupDTO appActUserCancelsignupDTO){
-        return actUserRelationService.activityCancelSignUp(userId,actId);
+
+        return actUserRelationService.activityCancelSignUp(appActUserCancelsignupDTO);
     }
 
     /**

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

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.activity.service;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppClockListDTO;
 import com.elink.esua.epdc.activity.form.ActUserRelationAuditFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoClockResultDTO;
@@ -119,12 +120,11 @@ public interface ActUserRelationService extends BaseService<ActUserRelationEntit
     /**
      * 取消活动报名
      *
-     * @param userId
+     * @param appActUserCancelsignupDTO
-     * @param actId
      * @author wanggongfeng
      * @date 2019-12-16
      */
-    Result activityCancelSignUp(String userId,String actId);
+    Result activityCancelSignUp(AppActUserCancelsignupDTO appActUserCancelsignupDTO);
 
     /**
      * 查询人员活动关系Id

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

@@ -180,13 +180,14 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
     }
 
     @Override
-    public Result activityCancelSignUp(String userId,String actId) {
+    public Result activityCancelSignUp(AppActUserCancelsignupDTO appActUserCancelsignupDTO) {
 
         //查询是否已报名
-        List<ActUserRelationDTO> data = baseDao.selectOneActUserRelationInfo(userId,actId);
+        List<ActUserRelationDTO> data = baseDao.selectOneActUserRelationInfo(appActUserCancelsignupDTO.getUserId(),appActUserCancelsignupDTO.getActId());
         if(data != null && data.size() > 0){
             ActUserRelationDTO actUserRelationDTO = data.get(0);
             actUserRelationDTO.setStatus("3");//取消报名
+            actUserRelationDTO.setFailureReason(appActUserCancelsignupDTO.getFailureReason());//取消报名原因
             //已报名该活动，进行取消报名
             //更新活动人员关系表
             ActUserRelationEntity entity = ConvertUtils.sourceToTarget(actUserRelationDTO, ActUserRelationEntity.class);