From c536d2a0ba96a383f1e168a269e1c564833f401c Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期四, 27 七月 2023 17:02:25 +0800
Subject: [PATCH] 开始上课的课时详情的记录列表筛选条件的调整
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 19 +++++++++++++++++++
cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/RecordTimeRequest.java | 2 +-
2 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/RecordTimeRequest.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/RecordTimeRequest.java
index 6d26c36..545f219 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/RecordTimeRequest.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/RecordTimeRequest.java
@@ -18,6 +18,6 @@
@ApiModelProperty(value = "结束时间 格式：yyyy-MM", dataType = "string")
private String endTime;
- @ApiModelProperty(value = "类型：1购买课包 2消费扣除 3报名赛事 4介绍有礼 5全部", dataType = "int")
+ @ApiModelProperty(value = "类型：1增加 2扣减 ", dataType = "int")
private Integer type;
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index 9a11a95..dea5145 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -253,6 +253,25 @@
List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(request);
purchaseRecordVoList.addAll(purchaseRecordVos1);
+ if (purchaseRecordVoList.size() > 0 ){
+ purchaseRecordVoList = purchaseRecordVoList.stream()
+ .filter(record -> {
+ String fieldValue = record.getPurchaseAmount();
+ if (ToolUtil.isNotEmpty(timeRequest.getType())){
+ switch (timeRequest.getType()){
+ case 1:
+ return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '-';
+ case 2:
+ return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '+';
+ default:
+ break;
+ }
+ }
+ return false;
+ })
+ .collect(Collectors.toList());
+ }
+
purchaseRecordVoList = dealDataOfTime(purchaseRecordVoList);
return purchaseRecordVoList;
}
--
Gitblit v1.7.1