积分埋点-积分模块修改

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppPointsRankingTopTenDTO.java

@@ -0,0 +1,36 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 移动端接口-积分管理模块-积分排行接口返回值 - 前十
+ * @Author zhangyong
+ * @Date 2020-05-13
+ */
+@Data
+public class EpdcAppPointsRankingTopTenDTO implements Serializable {
+
+    private static final long serialVersionUID = 3908231797102233188L;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 积分
+     */
+    private Integer points;
+
+    /**
+     * 取排行榜 名次
+     */
+    private Integer rank;
+}

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppPointsRankingUserDTO.java

@@ -0,0 +1,36 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 移动端接口-积分管理模块-积分排行接口返回值 - 用户排名信息
+ * @Author zhangyong
+ * @Date 2020-05-13
+ */
+@Data
+public class EpdcAppPointsRankingUserDTO implements Serializable {
+
+    private static final long serialVersionUID = 3908231797102233188L;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 积分
+     */
+    private Integer points;
+
+    /**
+     * 用户个人排名
+     */
+    private Integer rank;
+}

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsBehaviorDTO.java

@@ -0,0 +1,100 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 积分动作管理表 积分动作管理表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-04-28
+ */
+@Data
+public class PointsBehaviorDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 动作编码
+     */
+	private String behaviorCode;
+
+    /**
+     * 动作描述
+     */
+	private String behaviorDesc;
+
+    /**
+     * 动作记录时机 0-方法执行前，1-方法执行后
+     */
+	private String behaviorRecordingTime;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 删除标识 0-否，1-是
+     */
+	private String delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 虚字段 - 序号
+     */
+    private Integer orderNumber;
+
+    /**
+     * 虚字段 - true 动作不可选择  false 动作可选择
+     */
+    private boolean disabled;
+}

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsBehaviorRuleDTO.java

@@ -0,0 +1,81 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 积分动作规则关系表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class PointsBehaviorRuleDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 动作ID
+     */
+	private String behaviorId;
+
+    /**
+     * 规则ID
+     */
+	private String ruleId;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 删除标识 0-否，1-是
+     */
+	private String delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/logs/PointsLogsDTO.java → epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java

@@ -15,19 +15,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto.logs;
+package com.elink.esua.epdc.dto;
-
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import lombok.Data;
 
 
 /**
- * 积分日志表
+ * 积分记录表 积分记录表
  *
- * @author qu qu@elink-cn.com
+ * @author elink elink@elink-cn.com
- * @since v1.0.0 2019-12-13
+ * @since v1.0.0 2020-04-29
  */
 @Data
 public class PointsLogsDTO implements Serializable {
@@ -35,22 +34,45 @@ public class PointsLogsDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 主键
+     * ID
      */
 	private String id;
 
     /**
-     * 志愿者ID
+     * 用户ID
      */
-	private String volunteerId;
+	private String userId;
 
     /**
-     * 用户ID
+     * 用户昵称
      */
-	private String userId;
+    private String nickname;
+
+
+
+    /**
+     * 用户头像
+     */
+    private String faceImg;
+
+
+    /**
+     * 关联表ID
+     */
+	private String referenceId;
+
+    /**
+     * 积分规则编码
+     */
+	private String ruleCode;
 
     /**
-	 * 积分操作类型（0-减积分，1-加积分）
+     * 积分行为编码
+     */
+	private String behaviorCode;
+
+    /**
+     * 积分操作类型 0-减积分，1-加积分
      */
 	private String operationType;
 
@@ -70,35 +92,25 @@ public class PointsLogsDTO implements Serializable {
 	private Date operationTime;
 
     /**
-	 * 操作方式（user-用户操作，admin-管理员操作，sys-系统操作）
+     * 操作方式 user-用户操作，admin-管理员操作，sys-系统操作
      */
 	private String operationMode;
 
     /**
-	 * 积分规则编码
+     * 剩余积分值
      */
-	private String ruleCode;
+	private Integer lavePoints;
-
 
     /**
-	 * 是否操作成功(0-失败，1-成功)
+     * 乐观锁
-	 */
-	private String status;
-	/**
-	 * 操作失败原因
      */
-	private String failureReason;
+	private Integer revision;
 
     /**
-	 * 删除标记
+     * 删除标识 0-否，1-是
      */
 	private String delFlag;
 
-	/**
-	 * 乐观锁
-	 */
-	private Integer revision;
-
     /**
      * 创建人
      */
@@ -120,17 +132,8 @@ public class PointsLogsDTO implements Serializable {
 	private Date updatedTime;
 
 	/**
-	 * 剩余积分值
+	 * 志愿者ID
-	 */
-	private Integer lavePoints;
-
-	/**
-	 * 积分行为编码
 	 */
-	private String behaviorCode;
+	private String volunteerId;
 
-	/**
-	 * 关联表ID关联表id
-	 */
-	private String referenceId;
 }

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/rule/PointsRuleDTO.java → epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsRuleDTO.java

@@ -15,19 +15,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto.rule;
+package com.elink.esua.epdc.dto;
-
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
 
 
 /**
- * 积分规则表
+ * 积分规则管理表 积分规则管理表
  *
- * @author qu qu@elink-cn.com
+ * @author zhangyong
- * @since v1.0.0 2019-12-11
+ * @since v1.0.0 2020-04-28
  */
 @Data
 public class PointsRuleDTO implements Serializable {
@@ -35,69 +36,69 @@ public class PointsRuleDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 主键
+     * ID
      */
 	private String id;
 
     /**
-     * 规则编码
+     * 积分规则编码
      */
 	private String ruleCode;
 
     /**
-     * 规则描述
+     * 动作编码
      */
-	private String ruleDesc;
+	private String behaviorCode;
 
     /**
-     * 积分值
+     * 积分规则描述
      */
-	private Integer points;
+	private String ruleDesc;
 
     /**
-     * 规则操作类型(0-减积分，1-加积分)
+     * 规则操作类型 0-减积分，1-加积分
      */
 	private String operationType;
 
     /**
-     * 可用标记(0-不可用，1-可用)
+     * 积分规则值
      */
-	private String available;
+	private Integer points;
 
     /**
-     * 积分行为编码
+     * 上线统计指标 0-分钟，1-小时，2-日，3-月，4-年
      */
-	private String behaviorCode;
+	private String limitType;
 
     /**
-     * 积分行为描述
+     * 积分上限值
      */
-	private String behaviorDesc;
+	private Integer upperLimitVal;
 
     /**
-     * 积分是否有上限限制(0-否，1-是)
+     * 启用标识 0-否，1-是
      */
-	private String upperLimitFlag;
+	private String enableFlag;
 
     /**
-     * 限制时限(0-分钟，1-小时，2-日，3-月，4-年)
+     * 附加值
      */
-	private String limitTimeType;
+	private String addedVal;
 
     /**
-     * 积分上限值
+     * 备注
      */
-	private Integer upperLimitVal;
+	private String remark;
 
     /**
-     * 删除标记
+     * 乐观锁
      */
-	private String delFlag;
+	private Integer revision;
 
     /**
-     * 乐观锁
+     * 删除标识 0-否，1-是
      */
-	private Integer revision;
+	private String delFlag;
 
     /**
      * 创建人
@@ -119,4 +120,18 @@ public class PointsRuleDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 动作上限次数0-不限 1-一次 ....
+     */
+    private String limitNum;
+
+    /**
+     * 虚字段 - 序号
+     */
+    private Integer orderNumber;
+
+    /**
+     * 积分规则编码
+     */
+    private List<String> behaviorCodeArray;
 }

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java

@@ -0,0 +1,360 @@
+/**
+ * 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;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 用户信息表
+ *
+ * @author qu qu@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@Data
+public class UserDTO implements Serializable {
+
+    private static final long serialVersionUID = 915598602233599300L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 认证时间
+     */
+    private Date registerTime;
+
+    /**
+     * 头像
+     */
+    private String faceImg;
+
+    /**
+     * 性别(女性-0，男性-1)
+     * {@link com.elink.esua.epdc.commons.tools.enums.UserSexEnum}
+     */
+    private String sex;
+
+    /**
+     * 生日
+     */
+    private Date birthday;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 电话
+     */
+    private String telephone;
+
+    /**
+     * 邮编
+     */
+    private String zipCode;
+
+    /**
+     * 职业
+     */
+    private String profession;
+
+    /**
+     * 爱好
+     */
+    private String hobbies;
+
+    /**
+     * 个性签名
+     */
+    private String userSign;
+
+    /**
+     * 邀请码
+     */
+    private String invitationCode;
+
+    /**
+     * 最近登录时间
+     */
+    private Date lastLoginTime;
+
+    /**
+     * 最近登录IP
+     */
+    private String lastLoginIp;
+
+    /**
+     * 最近登录位置经度
+     */
+    private String lastLongitude;
+
+    /**
+     * 最近登录位置维度
+     */
+    private String lastLatitude;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 身份证号
+     */
+    private String identityNo;
+
+    /**
+     * 所在道路（如山东路168号）
+     */
+    private String road;
+
+    /**
+     * 小区名称
+     */
+    private String villageName;
+
+    /**
+     * 住处（楼栋-单元-房间）
+     */
+    private String dwellingPlace;
+
+    /**
+     * 居民住址
+     */
+    private String address;
+
+    /**
+     * 微信OPENID
+     */
+    private String wxOpenId;
+
+    /**
+     * 微信unionId
+     */
+    private String wxUnionId;
+
+    /**
+     * 是否是党员(0-否，1-是)
+     */
+    private String partyFlag;
+
+    /**
+     * 注册方式（wx：微信注册）
+     */
+    private String registerWay;
+
+    /**
+     * 用户来源(wp:公众号)
+     */
+    private String registerSource;
+
+    /**
+     * 手机号所属省份
+     */
+    private String mobileProvince;
+
+    /**
+     * 手机号所属城市
+     */
+    private String mobileCity;
+
+    /**
+     * 手机号所属运营商
+     */
+    private String mobileCarrier;
+
+    /**
+     * 用户积分
+     */
+    private Integer points;
+
+    /**
+     * 用户累计
+     */
+    private Integer points_totle;
+
+    /**
+     * 邀请人ID
+     */
+    private String inviteUserId;
+
+    /**
+     * 状态，参考枚举类：{@link com.elink.esua.epdc.enums.AppUserStatesEnum}
+     */
+    private String state;
+
+    /**
+     * 区县
+     */
+    private String district;
+
+    /**
+     * 区县ID
+     */
+    private Long districtId;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 街道ID
+     */
+    private Long streetId;
+
+    /**
+     * 社区
+     */
+    private String community;
+
+    /**
+     * 社区ID
+     */
+    private Long communityId;
+
+    /**
+     * 网格
+     */
+    private String grid;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+
+    /**
+     * 删除标记
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 注册时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    /**
+     * 姓
+     */
+    private String lastName;
+
+    /**
+     * 名
+     */
+    private String firstName;
+    /**
+     * 干部下沉 0不
+     */
+    private String cadreFlag;
+    /**
+     * 党员标签
+     */
+    private String tagIds;
+
+    /**
+     * 审核备注
+     */
+    private String remark;
+
+    /**
+     * 是否是网格长
+     */
+    private String leaderFlag;
+
+    /**
+     * 认证历史-累计提交认证次数
+     */
+    private Integer totalSubmitNum;
+
+    /**
+     * 认证历史-通过次数
+     */
+    private Integer totalPassSubmitNum;
+
+    /**
+     * 认证历史-不通过次数
+     */
+    private Integer totalFailNum;
+    /**
+     * 居住网格id
+     */
+    private Long deptId;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+    private String allDeptNames;
+}

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/logs/UserPointsLogDTO.java → epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/UserPointsLogDTO.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.logs;
+package com.elink.esua.epdc.dto;
 
 import lombok.Data;
 

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/constant/PointsNoticeConstant.java → epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/constant/PointsNoticeConstant.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.constant;
+package com.elink.esua.epdc.dto.constant;
 
 /**
  * @Description 积分商城模块发送消息常量

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/form/PointsLogsAddFormDTO.java

@@ -0,0 +1,95 @@
+/**
+ * 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 lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 积分记录表 添加
+ *
+ * @author songyunpeng
+ * @since v1.0.0 2020-04-29
+ */
+@Data
+public class PointsLogsAddFormDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 用户头像
+     */
+    private String faceImg;
+
+    /**
+     * 关联表ID
+     */
+    private String referenceId;
+
+    /**
+     * 积分规则编码
+     */
+    private String ruleCode;
+
+    /**
+     * 积分行为编码
+     */
+    private String behaviorCode;
+
+    /**
+     * 积分操作类型 0-减积分，1-加积分
+     */
+    private String operationType;
+
+    /**
+     * 操作积分值
+     */
+    private Integer points;
+
+    /**
+     * 操作描述
+     */
+    private String operationDesc;
+
+    /**
+     * 操作时间
+     */
+    private Date operationTime;
+
+    /**
+     * 操作方式 user-用户操作，admin-管理员操作，sys-系统操作
+     */
+    private String operationMode;
+
+    /**
+     * 剩余积分值
+     */
+    private Integer lavePoints;
+
+}

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/form/PointsLogsFormDTO.java

@@ -0,0 +1,80 @@
+/**
+ * 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 javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 积分记录查询 参数
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-04-29
+ */
+@Data
+public class PointsLogsFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户头像
+     */
+    private String faceImg;
+
+
+    /**
+     * 关联表ID
+     */
+    private String referenceId;
+
+    /**
+     * 积分行为编码
+     */
+    private String behaviorCode;
+    /**
+     * 积分规则编码
+     */
+    private String ruleCode;
+
+    /**
+     * 上限日期标识
+     */
+    private String operationFlag;
+
+    /**
+     * 上限值
+     */
+    private Integer upperLimitVal;
+
+
+}

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/result/BehaviorResultDto.java

@@ -0,0 +1,71 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author songyunpeng
+ * @Description
+ * @create 2020-04-28
+ */
+@Data
+public class BehaviorResultDto implements Serializable {
+    private static final long serialVersionUID = 5458618984429715932L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 动作编码
+     */
+    private String behaviorCode;
+
+    /**
+     * 动作描述
+     */
+    private String behaviorDesc;
+
+    /**
+     * 动作记录时机 0-方法执行前，1-方法执行后
+     */
+    private String behaviorRecordingTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 删除标识 0-否，1-是
+     */
+    private String delFlag;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+}

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java

@@ -0,0 +1,135 @@
+/**
+ * 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.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 积分记录表 积分记录表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-04-29
+ */
+@Data
+public class PointsLogsResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+
+
+    /**
+     * 用户头像
+     */
+    private String faceImg;
+
+    /**
+     * 关联表ID
+     */
+	private String referenceId;
+
+    /**
+     * 积分规则编码
+     */
+	private String ruleCode;
+
+    /**
+     * 积分行为编码
+     */
+	private String behaviorCode;
+
+    /**
+     * 积分操作类型 0-减积分，1-加积分
+     */
+	private String operationType;
+
+    /**
+     * 操作积分值
+     */
+	private Integer points;
+
+    /**
+     * 操作描述
+     */
+	private String operationDesc;
+
+    /**
+     * 操作时间
+     */
+	private Date operationTime;
+
+    /**
+     * 操作方式 user-用户操作，admin-管理员操作，sys-系统操作
+     */
+	private String operationMode;
+
+    /**
+     * 剩余积分值
+     */
+	private Integer lavePoints;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 删除标识 0-否，1-是
+     */
+	private String delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsSumResultDTO.java

@@ -0,0 +1,50 @@
+/**
+ * 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.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 一定时限内的积分总和返回
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-04-29
+ */
+@Data
+public class PointsLogsSumResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 总和
+     */
+	private Integer total;
+
+
+    /**
+     * 操作时间
+     */
+    private Date operationTime;
+
+
+
+}

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsRuleResultDTO.java

@@ -0,0 +1,90 @@
+/**
+ * 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.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 积分规则管理表 积分规则管理表
+ *
+ * @author zhangyong
+ * @since v1.0.0 2020-04-28
+ */
+@Data
+public class PointsRuleResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 积分规则编码
+     */
+	private String ruleCode;
+
+    /**
+     * 动作编码
+     */
+	private String behaviorCode;
+
+    /**
+     * 动作描述
+     */
+    private String behaviorDesc;
+    /**
+     * 积分规则描述
+     */
+	private String ruleDesc;
+
+    /**
+     * 规则操作类型 0-减积分，1-加积分
+     */
+	private String operationType;
+
+    /**
+     * 积分规则值
+     */
+	private Integer points;
+
+    /**
+     * 上线统计指标 0-分钟，1-小时，2-日，3-月，4-年
+     */
+	private String limitType;
+
+    /**
+     * 积分上限值
+     */
+	private Integer upperLimitVal;
+
+    /**
+     * 启用标识 0-否，1-是
+     */
+	private String enableFlag;
+
+    /**
+     * 附加值
+     */
+	private String addedVal;
+
+    /**
+     * 动作上限次数0-不限 1-一次 ....
+     */
+    private String limitNum;
+}

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsStatisticsListResultDTO.java

@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class PointsStatisticsListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8249595537995735691L;
+
+    /**
+     * 总积分
+     */
+    private int allPoints;
+
+    /**
+     * 消耗积分
+     */
+    private int residuePoints;
+
+    /**
+     * 操作描述
+     */
+    private String operationDesc;
+
+}

epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/EpdcAdjustUserPointsDTO.java

@@ -0,0 +1,80 @@
+package com.elink.esua.epdc.dto;
+
+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
+ * @Date 2019/12/16 17:25
+ */
+@Data
+public class EpdcAdjustUserPointsDTO implements Serializable {
+	private static final long serialVersionUID = -2810969141214818209L;
+
+	/**
+	 * 用户ID
+	 */
+	@NotBlank(message = "用户不能为空")
+	private String id;
+
+
+	/**
+	 * 姓名
+	 */
+	private String realName;
+
+	/**
+	 * 用户昵称
+	 */
+	private String nickname;
+
+	/**
+	 * 用户头像
+	 */
+	private String faceImg;
+
+	/**
+	 * 性别(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;
+
+
+}

epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java

@@ -33,6 +33,16 @@ public class EpdcAdjustVolunteerPointsDTO implements Serializable {
 	 */
 	private String realName;
 
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 用户头像
+     */
+    private String faceImg;
+
 	/**
 	 * 性别(0-女，1-男)
 	 */