未开始取消报名后，没有积分描述 bug 修改

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java

@@ -255,7 +255,20 @@ public enum BehaviorEnum {
     /**
      * 用户进入社群
      */
-    GROUP_OPEN("group_open");
+    GROUP_OPEN("group_open"),
+    /**
+     * 爽约
+     */
+    BREAK_PROMISE("break_promise"),
+    /**
+     * 手动调整志愿者积分
+     */
+    HAND_REGULATION_BEHAVIOR("hand_regulation_behavior"),
+
+    /**
+     * 活动积分
+     */
+    JOIN_ACT("join_act");
 
 
     private String value;

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

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.activity.result.ActUserClockLogResultDTO;
 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.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsBehaviorCodeEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum;
@@ -44,6 +45,7 @@ import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
+import com.elink.esua.epdc.dto.result.BehaviorResultDto;
 import com.elink.esua.epdc.modules.activity.dao.ActUserClockLogDao;
 import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity;
 import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity;
@@ -222,6 +224,11 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         if (!result.success()) {
             throw new RenException("更新用户积分异常");
         }
+        //根据行为编码获取行为信息
+        Result<BehaviorResultDto> behaviorCodeInfo = pointsFeignClient.getBehaviorCodeInfo(BehaviorEnum.JOIN_ACT.getValue());
+        if (!behaviorCodeInfo.success() || behaviorCodeInfo.getData()==null){
+            throw new RenException("获取动作编码信息异常或无此动作编码");
+        }
         pointsLogsDTO.setVolunteerId(volunteerInfoDTOResult.getData().getId());
         pointsLogsDTO.setUserId(actUserRelationDTO.getUserId());
         pointsLogsDTO.setNickname(actUserRelationDTO.getNickname());
@@ -232,9 +239,9 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         pointsLogsDTO.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_ADMIN.getOperationMode());
         pointsLogsDTO.setRuleCode(PointsRuleCodeEnum.CONFIRM_JOIN_ACT.getRuleCode());
         pointsLogsDTO.setLavePoints(result.getData().getPoints());//剩余积分值
-        pointsLogsDTO.setBehaviorCode(PointsBehaviorCodeEnum.JOIN_ACT.getBehaviorCode());
+        pointsLogsDTO.setBehaviorCode(behaviorCodeInfo.getData().getBehaviorCode());
         pointsLogsDTO.setReferenceId(actUserPointsLogEntity.getId());
-        pointsLogsDTO.setOperationDesc(actPointCheckFormDTO.getFailureReason());
+        pointsLogsDTO.setOperationDesc(behaviorCodeInfo.getData().getBehaviorDesc());
         return pointsFeignClient.addPointsLog(pointsLogsDTO);
     }
 

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

@@ -27,6 +27,7 @@ import com.elink.esua.epdc.activity.result.ActUserRelationResultDTO;
 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.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsBehaviorCodeEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum;
@@ -45,6 +46,7 @@ import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
+import com.elink.esua.epdc.dto.result.BehaviorResultDto;
 import com.elink.esua.epdc.modules.activity.dao.ActInfoDao;
 import com.elink.esua.epdc.modules.activity.dao.ActUserLogDao;
 import com.elink.esua.epdc.modules.activity.dao.ActUserRelationDao;
@@ -347,6 +349,11 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         actUserPointsLogDTO.setPoints(actInfoDTO.getPunishmentPoints());
         ActUserPointsLogEntity actUserPointsLog = actUserPointsLogService.insertActUserPointsLogDTO(actUserPointsLogDTO);
         //6、插入points记录
+        //通过动作编码获取动作信息
+        Result<BehaviorResultDto> behaviorCodeInfo = pointsFeignClient.getBehaviorCodeInfo(BehaviorEnum.BREAK_PROMISE.getValue());
+        if (!behaviorCodeInfo.success() || behaviorCodeInfo.getData()==null){
+            throw new RenException("获取动作编码信息异常或无此动作编码");
+        }
         PointsLogsDTO pointsLogsDTO = new PointsLogsDTO();
         pointsLogsDTO.setVolunteerId(volunteerInfoDTOResult.getData().getId());
         pointsLogsDTO.setUserId(actUserRelationDTO.getUserId());
@@ -358,8 +365,10 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         pointsLogsDTO.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_USER.getOperationMode());
         pointsLogsDTO.setRuleCode(PointsRuleCodeEnum.CANCEL_ACT.getRuleCode());//积分规则编码
         pointsLogsDTO.setLavePoints(result.getData().getPoints());//剩余积分值
-        pointsLogsDTO.setBehaviorCode(PointsBehaviorCodeEnum.BREAK_PROMISE.getBehaviorCode());//积分行为编码
+        pointsLogsDTO.setBehaviorCode(BehaviorEnum.BREAK_PROMISE.getValue());//积分行为编码
         pointsLogsDTO.setReferenceId(actUserPointsLog.getId());
+        //积分日志描述
+        pointsLogsDTO.setOperationDesc(behaviorCodeInfo.getData().getBehaviorDesc());
         pointsFeignClient.addPointsLog(pointsLogsDTO);
         //发送消息通知
         this.sendUserInformation(actUserRelationDTO, actInfoDTO, HeartNoticeConstant.NOTICE__BUSINESS_TYPE_POINTS_SIGN_OUT);

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java

@@ -3,14 +3,17 @@ package com.elink.esua.epdc.modules.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.PointsLogsDTO;
+import com.elink.esua.epdc.dto.result.BehaviorResultDto;
 import com.elink.esua.epdc.modules.feign.fallback.PointsFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  *
- * 调用用户模块
+ * 调用积分模块
  *
  * @Author：wanggongfeng
  * @Date：2019/12/16 17:36
@@ -20,5 +23,14 @@ public interface PointsFeignClient {
 
     @PostMapping("/points/pointslogs/addPointsLog")
     Result addPointsLog(@RequestBody PointsLogsDTO dto);
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @Description 获取动作编码信息
+     * @Author songyunpeng
+     * @Date 2020/4/28
+     * @Param [behaviorCode]
+     **/
+    @PostMapping(value = "points/points/getBehaviorCodeInfo/{behaviorCode}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<BehaviorResultDto> getBehaviorCodeInfo(@PathVariable String behaviorCode);
 
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java

@@ -4,6 +4,7 @@ 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;
 import com.elink.esua.epdc.dto.PointsLogsDTO;
+import com.elink.esua.epdc.dto.result.BehaviorResultDto;
 import com.elink.esua.epdc.modules.feign.PointsFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -20,4 +21,8 @@ public class PointsFeignClientFallback implements PointsFeignClient {
     public Result addPointsLog(PointsLogsDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "addPointsLog", dto);
     }
+    @Override
+    public Result<BehaviorResultDto> getBehaviorCodeInfo(String behaviorCode) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "getBehaviorCodeInfo", behaviorCode);
+    }
 }

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsBehaviorController.java

@@ -100,4 +100,16 @@ public class PointsBehaviorController {
         List<PointsBehaviorDTO> data = pointsBehaviorService.listBehaviorDesc();
         return new Result<List<PointsBehaviorDTO>>().ok(data);
     }
+    /**
+     * @Description  志愿者服务使用- 获取全部动作编码
+     * @Author songyunpeng
+     * @Date  2020/5/12
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.PointsBehaviorDTO>>
+     **/
+    @GetMapping("getAllBehaviorDesc")
+    public Result<List<PointsBehaviorDTO>> getAllBehaviorDesc(){
+        List<PointsBehaviorDTO> data = pointsBehaviorService.selectAllListBehaviorDesc();
+        return new Result<List<PointsBehaviorDTO>>().ok(data);
+    }
 }

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsBehaviorDao.java

@@ -57,6 +57,14 @@ public interface PointsBehaviorDao extends BaseDao<PointsBehaviorEntity> {
      * @Param []
      **/
     BehaviorResultDto getBehaviorCodeInfoByBehaviorCode(String behaviorCode);
+    /**
+     * @Description  志愿者服务使用- 获取全部动作编码 
+     * @Author songyunpeng
+     * @Date  2020/5/12
+     * @Param []
+     * @return java.util.List<com.elink.esua.epdc.dto.PointsBehaviorDTO>
+     **/
+    List<PointsBehaviorDTO> selectAllListBehaviorDesc();
 
     /**
      * 获取全部的动作编码

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsBehaviorService.java

@@ -114,4 +114,13 @@ public interface PointsBehaviorService extends BaseService<PointsBehaviorEntity>
      * @Date: 2020-04-29
      */
     List<PointsBehaviorDTO> listBehaviorDesc();
+
+    /**
+     * @Description   志愿者服务使用- 获取全部动作编码
+     * @Author songyunpeng
+     * @Date  2020/5/12
+     * @Param []
+     * @return java.util.List<com.elink.esua.epdc.dto.PointsBehaviorDTO>
+     **/
+    List<PointsBehaviorDTO> selectAllListBehaviorDesc();
 }

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsBehaviorServiceImpl.java

@@ -185,6 +185,11 @@ public class PointsBehaviorServiceImpl extends BaseServiceImpl<PointsBehaviorDao
         return baseDao.selectListBehaviorDesc();
     }
 
+    @Override
+    public List<PointsBehaviorDTO> selectAllListBehaviorDesc() {
+        return baseDao.selectAllListBehaviorDesc();
+    }
+
     /**
      * 查询积分动作管理表 动作描述是否存在
      * @param behaviorDesc  动作描述

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java

@@ -23,8 +23,10 @@ import com.elink.esua.epdc.async.NewsTask;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.constant.PointsConstant;
+import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationModeEnum;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 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;
@@ -37,15 +39,13 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.dto.form.PointsLogsFormDTO;
-import com.elink.esua.epdc.dto.result.PointsLogsResultDTO;
+import com.elink.esua.epdc.dto.result.*;
-import com.elink.esua.epdc.dto.result.PointsLogsSumResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO;
-import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO;
 import com.elink.esua.epdc.entity.PointsLogsEntity;
 import com.elink.esua.epdc.feign.UsersFeignClient;
 import com.elink.esua.epdc.redis.PointsLogsRedis;
+import com.elink.esua.epdc.service.PointsBehaviorService;
 import com.elink.esua.epdc.service.PointsLogsService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +72,9 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
     @Autowired
     private UsersFeignClient usersFeignClient;
 
+    @Autowired
+    private PointsBehaviorService pointsBehaviorService;
+
     @Autowired
     private NewsTask newsTask;
 
@@ -164,6 +167,11 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
         if(formDto.getOperatePoints()== NumConstant.ZERO){
             return new Result().error("操作积分不能为0");
         }
+        //根据动作编码获取动作信息
+        Result<BehaviorResultDto> behaviorCodeInfoByBehaviorCode = pointsBehaviorService.getBehaviorCodeInfoByBehaviorCode(formDto.getBehaviorCode());
+        if (!behaviorCodeInfoByBehaviorCode.success() || behaviorCodeInfoByBehaviorCode.getData()==null){
+            throw new RenException("获取动作编码信息异常或无此动作编码");
+        }
         PointsLogsEntity pointsLogsEntity=new PointsLogsEntity();
         pointsLogsEntity.setVolunteerId(formDto.getId());
         pointsLogsEntity.setUserId(formDto.getUserId());
@@ -172,10 +180,11 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
         pointsLogsEntity.setOperationTime(new Date());
         pointsLogsEntity.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_ADMIN.getOperationMode());//操作方式（user-用户操作，admin-管理员操作，sys-系统操作）
         pointsLogsEntity.setRuleCode(PointsConstant.ruleCode);
-        pointsLogsEntity.setBehaviorCode(PointsConstant.behaviorCodeCode);
+        pointsLogsEntity.setBehaviorCode(formDto.getBehaviorCode());
-        pointsLogsEntity.setOperationDesc(formDto.getAdjustReason());//操作描述
+        pointsLogsEntity.setOperationDesc(behaviorCodeInfoByBehaviorCode.getData().getBehaviorDesc());//操作描述
         pointsLogsEntity.setPoints(formDto.getOperatePoints());
         pointsLogsEntity.setOperationType(formDto.getOperationType());//积分操作类型（0-减积分，1-加积分）
+        pointsLogsEntity.setReferenceId(formDto.getId());//积分操作类型（0-减积分，1-加积分）
         EpdcUserPointsFormDTO userPointsFormDTO = new EpdcUserPointsFormDTO();
         userPointsFormDTO.setUserId(formDto.getUserId());
         userPointsFormDTO.setPoints(formDto.getOperatePoints());

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsBehaviorDao.xml

@@ -45,7 +45,15 @@
         from epdc_points_behavior where BEHAVIOR_CODE = #{behaviorCode} and DEL_FLAG ='0'  limit 1;
 
     </select>
-
+    <select id="selectAllListBehaviorDesc" resultType="com.elink.esua.epdc.dto.PointsBehaviorDTO">
+        SELECT
+            b.BEHAVIOR_CODE behaviorCode,
+            b.BEHAVIOR_DESC behaviorDesc
+        FROM
+            `epdc_points_behavior` b
+        WHERE
+            b.DEL_FLAG = 0
+    </select>
 
     <select id="selectListBehaviorDesc" resultType="com.elink.esua.epdc.dto.PointsBehaviorDTO">
         SELECT