取消报名扣积分关联id修改

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

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -39,9 +40,12 @@ public class EpdcAppActUserCancelsignupDTO implements Serializable {
     /**
      * 活动ID
      */
+    @NotBlank(message = "活动ID不能为空")
     private String actId;
+
     /**
      * 取消报名原因
      */
+    @NotBlank(message = "取消报名原因不能为空")
     private String failureReason;
 }

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

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -41,10 +42,12 @@ public class EpdcAppActUserClockLogDTO implements Serializable {
     /**
      * 活动ID
      */
+    @NotBlank(message = "活动ID不能为空")
     private String actId;
     /**
      * 打卡描述
      */
+    @NotBlank(message = "打卡描述不能为空")
     private String clockDesc;
     /**
      * 打卡位置经度
@@ -57,6 +60,7 @@ public class EpdcAppActUserClockLogDTO implements Serializable {
     /**
      * 打卡地址
      */
+    @NotBlank(message = "打卡地址不能为空")
     private String clockAddress;
     /**
      * 打卡图片
@@ -65,10 +69,12 @@ public class EpdcAppActUserClockLogDTO implements Serializable {
     /**
      * 打卡类型（0-打卡，1-更新打卡）
      */
+    @NotBlank(message = "打卡类型不能为空")
     private String clockType;
     /**
      * 打卡是否有效（0-否，1-是）
      */
+    @NotBlank(message = "打卡是否有效不能为空")
     private String effectiveFlag;
 
 }

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

@@ -12,6 +12,7 @@ import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
 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.commons.tools.validator.ValidatorUtils;
 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;
@@ -19,6 +20,7 @@ import com.elink.esua.epdc.dto.result.EpdcAppClockListDTO;
 import com.elink.esua.epdc.service.ActUserRelationService;
 import com.elink.esua.epdc.service.AppUserService;
 import com.elink.esua.epdc.utils.UserTagUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -51,6 +53,9 @@ public class ApiActUserRelationController {
      */
     @PostMapping("signup")
     public Result activitySignUp(@LoginUser TokenDto tokenDto,String actId) {
+        if (StringUtils.isBlank(actId)) {
+            return new Result().error("活动id不能为空");
+        }
         //验证是否为志愿者
         Result isVolunteer = appUserService.getVolunteerCountById(tokenDto);
         int code = isVolunteer.getCode();
@@ -93,6 +98,7 @@ public class ApiActUserRelationController {
      */
     @PostMapping("cancelsignup")
     public Result activityCancelSignUp(@LoginUser TokenDto tokenDto,@RequestBody EpdcAppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) {
+        ValidatorUtils.validateEntity(epdcAppActUserCancelsignupDTO);
         epdcAppActUserCancelsignupDTO.setUserId(tokenDto.getUserId());
         AppActUserCancelsignupDTO actUserCancelsignupDTO = ConvertUtils.sourceToTarget(epdcAppActUserCancelsignupDTO, AppActUserCancelsignupDTO.class);
         return actUserRelationService.activityCancelSignUp(actUserCancelsignupDTO);
@@ -110,6 +116,7 @@ public class ApiActUserRelationController {
      */
     @PostMapping("clock")
     public Result activityClock(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppActUserClockLogDTO epdcAppActUserClockLogDTO) {
+        ValidatorUtils.validateEntity(epdcAppActUserClockLogDTO);
         AppActUserClockLogDTO appActUserClockLogDTO = ConvertUtils.sourceToTarget(epdcAppActUserClockLogDTO, AppActUserClockLogDTO.class);
         appActUserClockLogDTO.setUserId(tokenDto.getUserId());
         return actUserRelationService.activityClock(appActUserClockLogDTO);

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

@@ -7,10 +7,13 @@ import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.service.ActInfoService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -61,6 +64,9 @@ public class ApiAppActInfoController {
      */
     @GetMapping("detail/{id}")
     public Result<ActInfoDetailAppResultDTO> detail(@PathVariable String id, @LoginUser TokenDto tokenDto) {
+        if (StringUtils.isBlank(id)) {
+            return new Result<ActInfoDetailAppResultDTO>().error("id不能为空");
+        }
         ActInfoAppFormDTO formDto = new ActInfoAppFormDTO();
         formDto.setId(id);
         formDto.setUserId(tokenDto.getUserId());

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

@@ -4,21 +4,14 @@ import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
-import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.FeignRequestInterceptor;
-import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
-import com.elink.esua.epdc.dto.item.form.*;
-import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.feign.fallback.ActInfoFeignClientFallback;
-import com.elink.esua.epdc.feign.fallback.WorkItemFeignClientFallback;
 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;
-import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 
@@ -27,7 +20,7 @@ import java.util.List;
  * @Author LPF
  * @Date 2019/11/18 16:39
  */
-@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = ActInfoFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
+@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = ActInfoFeignClientFallback.class, configuration = FeignRequestInterceptor.class, url = "http://127.0.0.1:9072")
 public interface ActInfoFeignClient {
 
 

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

@@ -20,7 +20,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:9072")
 public interface AppActUserRelationFeignClient {
 
     /**

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

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.activity;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -39,9 +40,11 @@ public class AppActUserCancelsignupDTO implements Serializable {
     /**
      * 活动ID
      */
+    @NotBlank(message = "活动ID不能为空")
     private String actId;
     /**
      * 取消报名原因
      */
+    @NotBlank(message = "取消报名原因不能为空")
     private String failureReason;
 }

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

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.activity;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -41,10 +42,12 @@ public class AppActUserClockLogDTO implements Serializable {
     /**
      * 活动ID
      */
+    @NotBlank(message = "活动ID不能为空")
     private String actId;
     /**
      * 打卡描述
      */
+    @NotBlank(message = "打卡描述不能为空")
     private String clockDesc;
     /**
      * 打卡位置经度
@@ -57,6 +60,7 @@ public class AppActUserClockLogDTO implements Serializable {
     /**
      * 打卡地址
      */
+    @NotBlank(message = "打卡地址不能为空")
     private String clockAddress;
     /**
      * 打卡图片
@@ -65,10 +69,12 @@ public class AppActUserClockLogDTO implements Serializable {
     /**
      * 打卡类型（0-打卡，1-更新打卡）
      */
+    @NotBlank(message = "打卡类型不能为空")
     private String clockType;
     /**
      * 打卡是否有效（0-否，1-是）
      */
+    @NotBlank(message = "打卡是否有效不能为空")
     private String effectiveFlag;
 
 }

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

@@ -21,6 +21,7 @@ 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.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.modules.activity.service.ActUserRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -55,7 +56,7 @@ public class AppActUserRelationController {
      */
     @GetMapping("activityCancelSignUp")
     public Result activityCancelSignUp(@RequestBody AppActUserCancelsignupDTO appActUserCancelsignupDTO){
-
+        ValidatorUtils.validateEntity(appActUserCancelsignupDTO);
         return actUserRelationService.activityCancelSignUp(appActUserCancelsignupDTO);
     }
 

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

@@ -92,4 +92,13 @@ public interface ActUserPointsLogService extends BaseService<ActUserPointsLogEnt
      * @date 2019-12-21
      */
     void delete(String[] ids);
+
+    /**
+     * @param actUserPointsLogDTO
+     * @return com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity
+     * @Author yinzuomei
+     * @Description 返回插入对象
+     * @Date 2020/2/6 16:47
+     **/
+    ActUserPointsLogEntity insertActUserPointsLogDTO(ActUserPointsLogDTO actUserPointsLogDTO);
 }

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

@@ -21,9 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.activity.ActUserPointsLogDTO;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.modules.activity.dao.ActUserPointsLogDao;
 import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity;
 import com.elink.esua.epdc.modules.activity.redis.ActUserPointsLogRedis;
@@ -101,4 +101,18 @@ public class ActUserPointsLogServiceImpl extends BaseServiceImpl<ActUserPointsLo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param actUserPointsLogDTO
+     * @return com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity
+     * @Author yinzuomei
+     * @Description 返回插入对象
+     * @Date 2020/2/6 16:47
+     **/
+    @Override
+    public ActUserPointsLogEntity insertActUserPointsLogDTO(ActUserPointsLogDTO actUserPointsLogDTO) {
+        ActUserPointsLogEntity entity = ConvertUtils.sourceToTarget(actUserPointsLogDTO, ActUserPointsLogEntity.class);
+        insert(entity);
+        return entity;
+    }
+
 }

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

@@ -50,6 +50,7 @@ import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity;
 import com.elink.esua.epdc.modules.activity.redis.ActUserRelationRedis;
 import com.elink.esua.epdc.modules.activity.service.ActInfoService;
 import com.elink.esua.epdc.modules.activity.service.ActUserLogService;
+import com.elink.esua.epdc.modules.activity.service.ActUserPointsLogService;
 import com.elink.esua.epdc.modules.activity.service.ActUserRelationService;
 import com.elink.esua.epdc.modules.feign.PointsFeignClient;
 import com.elink.esua.epdc.modules.feign.UserInfoFeignClient;
@@ -85,7 +86,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
 
     @Autowired
     private ActUserPointsLogDao actUserPointsLogDao;
-
+    @Autowired
+    private ActUserPointsLogService actUserPointsLogService;
     @Autowired
     private UserInfoFeignClient userInfoFeignClient;
 
@@ -291,8 +293,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         actUserPointsLogDTO.setOperationType(ActUserPointsOperationTypeConstant.CANCEL_ACT_SUBTRACT);
         actUserPointsLogDTO.setOperationPointsType(PointsOperationEnum.OPERATION_TYPE_SUBSTRACT.getOperationType());
         actUserPointsLogDTO.setPoints(actInfoDTO.getPunishmentPoints());
-        ActUserPointsLogEntity entity = ConvertUtils.sourceToTarget(actUserPointsLogDTO, ActUserPointsLogEntity.class);
-        actUserPointsLogDao.insert(entity);
+        ActUserPointsLogEntity actUserPointsLog = actUserPointsLogService.insertActUserPointsLogDTO(actUserPointsLogDTO);
         //6、插入points记录
         PointsLogsDTO pointsLogsDTO = new PointsLogsDTO();
         pointsLogsDTO.setVolunteerId(volunteerInfoDTOResult.getData().getId());
@@ -305,7 +306,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         pointsLogsDTO.setLavePoints(result.getData().getPoints());//剩余积分值
         pointsLogsDTO.setBehaviorCode(PointsBehaviorCodeEnum.BREAK_PROMISE.getBehaviorCode());//积分行为编码
         pointsLogsDTO.setStatus(YesOrNoEnum.YES.value());
-        pointsLogsDTO.setReferenceId(entity.getId());
+        pointsLogsDTO.setReferenceId(actUserPointsLog.getId());
         pointsFeignClient.addPointsLog(pointsLogsDTO);
     }
 

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/entity/PointsLogsEntity.java

@@ -18,7 +18,6 @@
 package com.elink.esua.epdc.modules.logs.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -97,4 +96,9 @@ public class PointsLogsEntity extends BaseEpdcEntity {
 	 * 积分行为编码
 	 */
 	private String behaviorCode;
+
+	/**
+	 * 关联表ID关联表id
+	 */
+	private String referenceId;
 }