From 996154fb8fab5468cdfc99efbab606605fb762e1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 七月 2025 17:40:34 +0800
Subject: [PATCH] 前端
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java
index adc8a7d..fee0839 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -10,6 +11,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -89,6 +91,7 @@
IPage<MemberRevenue> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<MemberRevenue> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setDeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(MemberRevenue::getId, pageWrap.getModel().getId());
}
@@ -139,6 +142,12 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(MemberRevenue::getStatus, pageWrap.getModel().getStatus());
}
+ if (StringUtils.isNotBlank(pageWrap.getModel().getTransactionNo())) {
+ queryWrapper.lambda().like(MemberRevenue::getTransactionNo, pageWrap.getModel().getTransactionNo());
+ }
+ queryWrapper.lambda().ge(pageWrap.getModel().getStartTime()!=null,MemberRevenue::getCreateTime,pageWrap.getModel().getStartTime());
+ queryWrapper.lambda().ne(pageWrap.getModel().getEndTime()!=null,MemberRevenue::getCreateTime,pageWrap.getModel().getEndTime());
+
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -146,7 +155,13 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(memberRevenueMapper.selectPage(page, queryWrapper));
+ PageData<MemberRevenue> result = PageData.from(memberRevenueMapper.selectPage(page, queryWrapper));
+ if(result!=null && result.getRecords()!=null){
+ for(MemberRevenue model :result.getRecords()){
+ model.setTypeName(Constants.RevenueType.getObjName(model.getType()));
+ }
+ }
+ return result;
}
@Override
--
Gitblit v1.9.3