diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/PointsConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/PointsConstant.java
new file mode 100644
index 000000000..f5eb87209
--- /dev/null
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/PointsConstant.java
@@ -0,0 +1,13 @@
+package com.elink.esua.epdc.commons.tools.constant;
+
+/**
+ * @Auther: yinzuomei
+ * @Date: 2019/12/16 19:38
+ * @Description: 积分用
+ */
+public interface PointsConstant {
+	/**
+	 * 手动调整积分编码
+	 */
+	String ruleCode ="hand_regulation";
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/logs/PointsLogsDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/logs/PointsLogsDTO.java
index d24b29e8b..ce8dfd2b8 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/logs/PointsLogsDTO.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/logs/PointsLogsDTO.java
@@ -118,4 +118,8 @@ public class PointsLogsDTO implements Serializable {
      */
 	private Date updatedTime;
 
+	/**
+	 * 剩余积分值
+	 */
+	private Integer lavePoints;
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
index a0abcd7d8..deb8b3e84 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
@@ -2,10 +2,13 @@ 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.UserDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.modules.feign.fallback.UserFeignClientFallback;
 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;
 
 /**
@@ -26,4 +29,14 @@ public interface UserFeignClient {
     @PostMapping(value = "app-user/user/handleUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result handleUserPoints(EpdcUserPointsFormDTO formDTO);
 
+    /**
+     * 查询用户基础信息
+     *
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/10/26 15:16
+     */
+    @GetMapping("app-user/epdc-app/user/getById/{userId}")
+    Result<UserDTO> getUserInfoById(@PathVariable("userId") String userId);
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
index 9ba719306..c9b61993a 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
@@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.feign.fallback;
 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.UserDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import org.springframework.stereotype.Component;
@@ -19,4 +20,9 @@ public class UserFeignClientFallback implements UserFeignClient {
 	public Result handleUserPoints(EpdcUserPointsFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "handleUserPoints", formDTO);
 	}
+
+	@Override
+	public Result<UserDTO> getUserInfoById(String userId) {
+		return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoById", userId);
+	}
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/controller/PointsLogsController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/controller/PointsLogsController.java
index 2fb5c83ec..0e50b45c1 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/controller/PointsLogsController.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/controller/PointsLogsController.java
@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
 import com.elink.esua.epdc.modules.logs.excel.PointsLogsExcel;
 import com.elink.esua.epdc.modules.logs.service.PointsLogsService;
@@ -32,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -90,4 +92,16 @@ public class PointsLogsController {
         ExcelUtils.exportExcelToTarget(response, null, list, PointsLogsExcel.class);
     }
 
+    /**
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 确定调整用户积分
+     * @Date 2019/12/16 18:56
+     **/
+    @PostMapping("confirmAdjustPoint")
+    public Result confirmAdjustPoint(@RequestBody  EpdcAdjustVolunteerPointsDTO formDto){
+        ValidatorUtils.validateEntity(formDto);
+        return pointsLogsService.confirmAdjustPoint(formDto);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/entity/PointsLogsEntity.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/entity/PointsLogsEntity.java
index b412d678d..42c5430ae 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/entity/PointsLogsEntity.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/entity/PointsLogsEntity.java
@@ -88,4 +88,8 @@ public class PointsLogsEntity extends BaseEpdcEntity {
      */
 	private String failureReason;
 
+	/**
+	 * 剩余积分值
+	 */
+	private Integer lavePoints;
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/PointsLogsService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/PointsLogsService.java
index 4ce070998..6d43ada76 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/PointsLogsService.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/PointsLogsService.java
@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.logs.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
 import com.elink.esua.epdc.modules.logs.entity.PointsLogsEntity;
 
@@ -93,4 +94,13 @@ public interface PointsLogsService extends BaseService<PointsLogsEntity> {
      * @date 2019-12-13
      */
     void delete(String[] ids);
+
+    /**
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 确定调整用户积分
+     * @Date 2019/12/16 18:56
+     **/
+    Result confirmAdjustPoint(EpdcAdjustVolunteerPointsDTO formDto);
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java
index 2b301eb5d..407a81a2c 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java
@@ -21,10 +21,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.PointsConstant;
+import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
+import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationModeEnum;
 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.utils.Result;
+import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
+import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.logs.dao.PointsLogsDao;
 import com.elink.esua.epdc.modules.logs.entity.PointsLogsEntity;
 import com.elink.esua.epdc.modules.logs.redis.PointsLogsRedis;
@@ -35,6 +42,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -50,6 +58,9 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
     @Autowired
     private PointsLogsRedis pointsLogsRedis;
 
+    @Autowired
+    private UserFeignClient userFeignClient;
+
     @Override
     public PageData<PointsLogsDTO> page(Map<String, Object> params) {
         IPage<PointsLogsEntity> page = baseDao.selectPage(
@@ -103,4 +114,38 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 确定调整用户积分
+     * @Date 2019/12/16 18:56
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result confirmAdjustPoint(EpdcAdjustVolunteerPointsDTO formDto) {
+        PointsLogsEntity pointsLogsEntity=new PointsLogsEntity();
+        pointsLogsEntity.setVolunteerId(formDto.getId());
+        pointsLogsEntity.setUserId(formDto.getUserId());
+        pointsLogsEntity.setOperationTime(new Date());
+        pointsLogsEntity.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_ADMIN.getOperationMode());//操作方式（user-用户操作，admin-管理员操作，sys-系统操作）
+        pointsLogsEntity.setStatus(YesOrNoEnum.YES.value());
+        pointsLogsEntity.setFailureReason("");
+        pointsLogsEntity.setRuleCode(PointsConstant.ruleCode);
+        pointsLogsEntity.setOperationDesc(formDto.getAdjustReason());//操作描述
+        pointsLogsEntity.setPoints(formDto.getOperatePoints());
+        pointsLogsEntity.setOperationType(formDto.getOperationType());//积分操作类型（0-减积分，1-加积分）
+        EpdcUserPointsFormDTO userPointsFormDTO=new EpdcUserPointsFormDTO();
+        userPointsFormDTO.setUserId(formDto.getUserId());
+        userPointsFormDTO.setPoints(formDto.getOperatePoints());
+        userPointsFormDTO.setOperationType(formDto.getOperationType());
+        Result result=userFeignClient.handleUserPoints(userPointsFormDTO);
+        Result<UserDTO> userDTOResult=userFeignClient.getUserInfoById(formDto.getUserId());
+        pointsLogsEntity.setLavePoints(userDTOResult.getData().getPoints());//剩余积分
+        if(!result.success()){
+            return new Result().error("调整用户积分失败");
+        }
+        this.insert(pointsLogsEntity);
+        return new Result();
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/rule/service/impl/PointsRuleServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/rule/service/impl/PointsRuleServiceImpl.java
index 1bbfcdf8a..c0fbfc170 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/rule/service/impl/PointsRuleServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/rule/service/impl/PointsRuleServiceImpl.java
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.enums.pointsenum.PointsLimitTimeEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsRuleAvailableEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsUpperLimitEnum;
 import com.elink.esua.epdc.commons.tools.page.PageData;
@@ -117,6 +118,9 @@ public class PointsRuleServiceImpl extends BaseServiceImpl<PointsRuleDao, Points
 		if (!checkResult.success()) {
 			return checkResult;
 		}
+		if(StringUtils.isBlank(dto.getLimitTimeType())){
+			dto.setLimitTimeType(PointsLimitTimeEnum.LIMIT_TIME_MINUTE.value());
+		}
 		dto.setAvailable(PointsRuleAvailableEnum.AVAILABLE_TRUE.value());//可用标记(0-不可用，1-可用) 新增时默认可用
 		PointsRuleEntity entity = ConvertUtils.sourceToTarget(dto, PointsRuleEntity.class);
 		insert(entity);
@@ -132,6 +136,9 @@ public class PointsRuleServiceImpl extends BaseServiceImpl<PointsRuleDao, Points
 		if (!checkResult.success()) {
 			return checkResult;
 		}
+		if(StringUtils.isBlank(dto.getLimitTimeType())){
+			dto.setLimitTimeType(PointsLimitTimeEnum.LIMIT_TIME_MINUTE.value());
+		}
 		PointsRuleEntity entity = ConvertUtils.sourceToTarget(dto, PointsRuleEntity.class);
 		updateById(entity);
 		String pointsRuleKey = RedisKeys.getPointsRuleKey(dto.getRuleCode());
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/logs/PointsLogsDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/logs/PointsLogsDao.xml
index 283aee7ae..9de2af1d7 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/logs/PointsLogsDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/logs/PointsLogsDao.xml
@@ -21,7 +21,8 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="lavePoints" column="LAVE_POINTS"></result>
     </resultMap>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java
new file mode 100644
index 000000000..aaafd495d
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java
@@ -0,0 +1,73 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 志愿者积分调整入参DTO
+ * @Author yinzuomei
+ * @Date 2019/12/16 17:25
+ */
+@Data
+public class EpdcAdjustVolunteerPointsDTO implements Serializable {
+	private static final long serialVersionUID = -2810969141214818209L;
+
+	/**
+	 * 志愿者ID
+	 */
+	@NotBlank(message = "主键不能为空")
+	private String id;
+
+	/**
+	 * 用户ID
+	 */
+	@NotBlank(message = "用户id为空")
+	private String userId;
+
+	/**
+	 * 姓名
+	 */
+	private String fullName;
+
+	/**
+	 * 性别(0-女，1-男)
+	 */
+	private String sex;
+
+	/**
+	 * 出生日期
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date birthday;
+
+	/**
+	 * 手机号
+	 */
+	private String mobile;
+
+	/**
+	 * 用户当前积分
+	 */
+	private Integer points;
+
+	/**
+	 * 调整原因
+	 */
+	@NotBlank(message = "调整原因不能为空")
+	private String adjustReason;
+
+	/**
+	 * 积分加值
+	 */
+	@NotBlank(message = "操作类型不能为空")
+	private String operationType;
+
+	/**
+	 * 积分减值
+	 */
+	private Integer operatePoints;
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
index 10afed76b..da774cb6c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.UserTagDTO;
 import com.elink.esua.epdc.dto.UserTagRelationDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.excel.VolunteerInfoExcel;
 import com.elink.esua.epdc.service.UserTagRelationService;
 import com.elink.esua.epdc.service.UserTagService;
@@ -50,7 +51,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("volunteerinfo")
 public class VolunteerInfoController {
-    
+
     @Autowired
     private VolunteerInfoService volunteerInfoService;
 
@@ -196,4 +197,16 @@ public class VolunteerInfoController {
         ExcelUtils.exportExcelToTarget(response, null, list, VolunteerInfoExcel.class);
     }
 
-}
\ No newline at end of file
+    /**
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO>
+     * @Author yinzuomei
+     * @Description 积分调整按钮按下,查询用户信息
+     * @Date 2019/12/16 17:48
+     **/
+    @GetMapping("queryById/{id}")
+    public Result<EpdcAdjustVolunteerPointsDTO> queryByUserId(@PathVariable("id") String id){
+        return volunteerInfoService.getAdjustVolunteerPointsDTO(id);
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
index ab2d77b20..745673c5e 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
@@ -20,6 +20,7 @@ package com.elink.esua.epdc.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.UserTagDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -88,4 +89,13 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
      * @return
      */
     int getVolunteerCountById(@Param("userId") String userId);
-}
\ No newline at end of file
+
+    /**
+     * @param id
+     * @return com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO
+     * @Author yinzuomei
+     * @Description 积分调整按钮按下, 查询用户信息
+     * @Date 2019/12/16 17:54
+     **/
+	EpdcAdjustVolunteerPointsDTO selectAdjustVolunteerPointsDTO(String id);
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java
index 78614bad2..e89c18fda 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java
@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserTagDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
 
 import java.util.List;
@@ -152,4 +153,14 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      * @return
      */
     Result<Integer> insertVolunteerInfo(EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO);
-}
\ No newline at end of file
+
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO>
+     * @Author yinzuomei
+     * @Description 积分调整按钮按下,查询用户信息
+     * @Date 2019/12/16 17:48
+     **/
+	Result<EpdcAdjustVolunteerPointsDTO> getAdjustVolunteerPointsDTO(String userId);
+
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
index 8a7be312c..feb505e17 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
@@ -31,6 +31,7 @@ import com.elink.esua.epdc.dto.UserTagDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
 import com.elink.esua.epdc.redis.VolunteerInfoRedis;
 import com.elink.esua.epdc.service.UserService;
@@ -225,5 +226,20 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         return new Result<Integer>().ok(0);
     }
 
+    /**
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO>
+     * @Author yinzuomei
+     * @Description 积分调整按钮按下, 查询用户信息
+     * @Date 2019/12/16 17:48
+     **/
+    @Override
+    public Result<EpdcAdjustVolunteerPointsDTO> getAdjustVolunteerPointsDTO(String id) {
+        if(StringUtils.isBlank(id) ){
+            return new Result<EpdcAdjustVolunteerPointsDTO>().error("志愿者主键不能为空");
+        }
+        EpdcAdjustVolunteerPointsDTO adjustVolunteerPointsDTO = baseDao.selectAdjustVolunteerPointsDTO(id);
+        return new Result<EpdcAdjustVolunteerPointsDTO>().ok(adjustVolunteerPointsDTO);
+    }
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
index 6e8887f7a..8391b9108 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -146,4 +146,21 @@
     <select id="getVolunteerCountById" resultType="Integer">
         SELECT IFNULL(count(*),0) count FROM `epdc_volunteer_info` where del_flag = '0' and id = #{id}
     </select>
-</mapper>
\ No newline at end of file
+
+    <select id="selectAdjustVolunteerPointsDTO" parameterType="java.lang.String" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO">
+        SELECT
+            m.id,
+            m.USER_ID as userId,
+            m.FULL_NAME as fullName,
+            m.SEX,
+            DATE_FORMAT(m.BIRTHDAY,'%Y-%m-%d') as birthday,
+            m.MOBILE,
+            eu.POINTS
+        FROM
+            epdc_volunteer_info m
+            LEFT JOIN epdc_user eu ON ( m.USER_ID = eu.ID )
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.ID = #{id}
+    </select>
+</mapper>