diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java index 6f1d48e7..fa79a5ef 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java @@ -22,8 +22,12 @@ import java.util.List; public interface PointsFeignClient { /** - * @Description: 当前登录用户 积分记录接口 - * @Param: [formDto] + * 当前登录用户 积分记录接口 + * + * @param formDto + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 + * param userId 必选 用户ID * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-04-29 @@ -32,8 +36,12 @@ public interface PointsFeignClient { Result> listPointsRecordFeignClient(EpdcAppPointsRecordFormDTO formDto); /** - * @Description: 积分排行接口(0 周排行、1 月排行) - * @Param: [formDto] + * 积分排行接口(0 周排行、1 月排行) + * + * @param formDto + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 + * param rankingType 必选 排名方式:0-周,1-月 * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-04-30 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PointsService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PointsService.java index 892f882c..7532437e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PointsService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PointsService.java @@ -17,8 +17,12 @@ import java.util.List; public interface PointsService { /** - * @Description: 当前登录用户 积分记录接口 - * @Param: [userDetail, dto] + * 当前登录用户 积分记录接口 + * + * @param formDto + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 + * @param userDetail 必选 获取用户ID * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-04-29 @@ -26,8 +30,12 @@ public interface PointsService { Result> listPointsRecord(TokenDto userDetail, EpdcAppPointsRecordFormDTO formDto); /** - * @Description: 积分排行接口(0 周排行、1 月排行) - * @Param: [formDto] + * 积分排行接口(0 周排行、1 月排行) + * + * @param formDto + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 + * param rankingType 必选 排名方式:0-周,1-月 * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-04-30 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsBehaviorDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsBehaviorDTO.java index cd1d6cec..cd3b305c 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsBehaviorDTO.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsBehaviorDTO.java @@ -91,5 +91,5 @@ public class PointsBehaviorDTO implements Serializable { /** * 虚字段 - 序号 */ - private int orderNumber; + private Integer orderNumber; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsRuleDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsRuleDTO.java index 421e6a53..9ef8e530 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsRuleDTO.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsRuleDTO.java @@ -126,5 +126,5 @@ public class PointsRuleDTO implements Serializable { /** * 虚字段 - 序号 */ - private int orderNumber; + private Integer orderNumber; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsBehaviorDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsBehaviorDao.java index dec06e42..4ba5a7f0 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsBehaviorDao.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsBehaviorDao.java @@ -34,9 +34,14 @@ import java.util.Map; @Mapper public interface PointsBehaviorDao extends BaseDao { - /** - * @Description: 动作管理 列表查询 - * @Param: [params] + /** + * 动作管理 列表查询 + * + * @param params + * param behaviorCode 可选 动作编码 + * param behaviorDesc 可选 动作描述 + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 * @return: java.util.List * @Author: zy * @Date: 2020-04-28 @@ -44,7 +49,8 @@ public interface PointsBehaviorDao extends BaseDao { List selectListPointsBehavior(Map params); /** - * @Description: 获取全部的动作编码 + * 获取全部的动作编码 + * * @Param: [] * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java index 7959e693..369bdb9b 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java @@ -37,8 +37,12 @@ import java.util.List; public interface PointsLogsDao extends BaseDao { /** - * @Description: 当前登录用户 积分记录接口 - * @Param: [dto] + * 当前登录用户 积分记录接口 + * + * @param formDto + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 + * param userId 必选 用户ID * @return: java.util.List * @Author: zy * @Date: 2020-04-29 @@ -46,8 +50,12 @@ public interface PointsLogsDao extends BaseDao { List selectListPointsRecord(EpdcAppPointsRecordFormDTO formDto); /** - * @Description: 积分排行接口(0 周排行、1 月排行) - * @Param: [formDto] + * 积分排行接口(0 周排行、1 月排行) + * + * @param formDto + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 + * param rankingType 必选 排名方式:0-周,1-月 * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-04-30 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java index 3abadc2f..76385724 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java @@ -44,8 +44,15 @@ public interface PointsRuleDao extends BaseDao { BehaviorResultDto getBehaviorCodeInfoByBehaviorCode(String behaviorCode); /** - * @Description: 积分规则配置 列表查询 - * @Param: [params] + * 积分规则配置 列表查询 + * + * @param params + * param ruleCode 可选 积分规则编码 + * param ruleDesc 可选 积分规则描述 + * param operationType 可选 规则操作类型 0-减积分,1-加积分 + * param enableFlag 可选 启用标识 0-否,1-是 + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 * @return: java.util.List * @Author: zy * @Date: 2020-04-29 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsBehaviorService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsBehaviorService.java index 7009849f..a8b800cf 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsBehaviorService.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsBehaviorService.java @@ -95,7 +95,8 @@ public interface PointsBehaviorService extends BaseService void delete(String[] ids); /** - * @Description: 获取全部的动作编码 + * 获取全部的动作编码 + * * @Param: [] * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java index 087f945c..62059b18 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java @@ -98,8 +98,12 @@ public interface PointsLogsService extends BaseService { void delete(String[] ids); /** - * @Description: 当前登录用户 积分记录接口 - * @Param: [dto] + * 当前登录用户 积分记录接口 + * + * @param formDto + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 + * param userId 必选 用户ID * @return: java.util.List * @Author: zy * @Date: 2020-04-29 @@ -107,8 +111,12 @@ public interface PointsLogsService extends BaseService { List listPointsRecord(EpdcAppPointsRecordFormDTO formDto); /** - * @Description: 积分排行接口(0 周排行、1 月排行) - * @Param: [formDto] + * 积分排行接口(0 周排行、1 月排行) + * + * @param formDto + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 + * param rankingType 必选 排名方式:0-周,1-月 * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-04-30