From 92479366fea52df2db816805b8758b490e5fe833 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Tue, 17 Dec 2019 12:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/logs/PointsLogsDTO.java | 5 +++++ .../epdc/modules/logs/entity/PointsLogsEntity.java | 5 +++++ .../logs/service/impl/PointsLogsServiceImpl.java | 11 +++++++++-- .../src/main/resources/mapper/logs/PointsLogsDao.xml | 1 + .../dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java | 6 ++++++ 5 files changed, 26 insertions(+), 2 deletions(-) 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 ce8dfd2b8..8b59d5af5 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 @@ -122,4 +122,9 @@ public class PointsLogsDTO implements Serializable { * 剩余积分值 */ private Integer lavePoints; + + /** + * 积分行为编码 + */ + private String behaviorCode; } 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 42c5430ae..5f9fac8a8 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 @@ -92,4 +92,9 @@ public class PointsLogsEntity extends BaseEpdcEntity { * 剩余积分值 */ private Integer lavePoints; + + /** + * 积分行为编码 + */ + private String behaviorCode; } 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 407a81a2c..45fcb91c9 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 @@ -63,9 +63,15 @@ public class PointsLogsServiceImpl extends BaseServiceImpl page(Map params) { + String volunteerId = (String) params.get("volunteerId"); + String behaviorCode=(String) params.get("behaviorCode"); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(volunteerId), "VOLUNTEER_ID", volunteerId) + .eq(StringUtils.isNotBlank(behaviorCode),"BEHAVIOR_CODE",behaviorCode); + IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) + getPage(params, FieldConstant.CREATED_TIME, false), + wrapper ); return getPageData(page, PointsLogsDTO.class); } @@ -142,6 +148,7 @@ public class PointsLogsServiceImpl extends BaseServiceImpl userDTOResult=userFeignClient.getUserInfoById(formDto.getUserId()); pointsLogsEntity.setLavePoints(userDTOResult.getData().getPoints());//剩余积分 + pointsLogsEntity.setBehaviorCode(formDto.getBehaviorCode()); if(!result.success()){ return new Result().error("调整用户积分失败"); } 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 9de2af1d7..1412307a3 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 @@ -22,6 +22,7 @@ + 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 index aaafd495d..1696f9f45 100644 --- 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 @@ -70,4 +70,10 @@ public class EpdcAdjustVolunteerPointsDTO implements Serializable { * 积分减值 */ private Integer operatePoints; + + /** + * 积分行为编码 + */ + @NotBlank(message = "积分行为编码不能为空") + private String behaviorCode; }