积分记录

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;
 }

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;
 }

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<PointsLogsDao, Points
 
     @Override
     public PageData<PointsLogsDTO> page(Map<String, Object> params) {
+        String volunteerId = (String) params.get("volunteerId");
+        String behaviorCode=(String) params.get("behaviorCode");
+        QueryWrapper<PointsLogsEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(volunteerId), "VOLUNTEER_ID", volunteerId)
+        .eq(StringUtils.isNotBlank(behaviorCode),"BEHAVIOR_CODE",behaviorCode);
+
         IPage<PointsLogsEntity> 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<PointsLogsDao, Points
         Result result=userFeignClient.handleUserPoints(userPointsFormDTO);
         Result<UserDTO> userDTOResult=userFeignClient.getUserInfoById(formDto.getUserId());
         pointsLogsEntity.setLavePoints(userDTOResult.getData().getPoints());//剩余积分
+        pointsLogsEntity.setBehaviorCode(formDto.getBehaviorCode());
         if(!result.success()){
             return new Result().error("调整用户积分失败");
         }

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

@@ -22,6 +22,7 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="lavePoints" column="LAVE_POINTS"></result>
+        <result property="behaviorCode" column="BEHAVIOR_CODE"/>
     </resultMap>
 
 

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;
 }