From bd6229ebd9cb543a22944ecb1142fad92b675dce Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 13 十月 2025 14:26:25 +0800
Subject: [PATCH] bug 修复
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java | 92 +++++++++++++++++----------------------------
1 files changed, 35 insertions(+), 57 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..a24c980 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,15 +1,20 @@
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;
import com.doumee.dao.business.MemberRevenueMapper;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRevenue;
+import com.doumee.dao.business.model.Orders;
import com.doumee.service.business.MemberRevenueService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -87,66 +92,39 @@
@Override
public PageData<MemberRevenue> findPage(PageWrap<MemberRevenue> pageWrap) {
IPage<MemberRevenue> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<MemberRevenue> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<MemberRevenue> queryWrapper = new MPJLambdaWrapper<MemberRevenue>()
+ .selectAll(MemberRevenue.class)
+ .selectAs(Member::getOpenid,MemberRevenue::getOpenid)
+ .selectAs(Member::getName,MemberRevenue::getMemberName)
+ .selectAs(Member::getNickName,MemberRevenue::getMemberNickname)
+ .selectAs(Member::getTelephone,MemberRevenue::getMemberPhone)
+ .selectAs(Orders::getWorkType,MemberRevenue::getWorkType)
+ .leftJoin(Member.class,Member::getId,MemberRevenue::getMemberId)
+ .leftJoin(Orders.class,Orders::getId,MemberRevenue::getObjId);
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getDeleted() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getDeleted, pageWrap.getModel().getDeleted());
- }
- if (pageWrap.getModel().getCreateUser() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getCreateUser, pageWrap.getModel().getCreateUser());
- }
- if (pageWrap.getModel().getCreateTime() != null) {
- queryWrapper.lambda().ge(MemberRevenue::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
- queryWrapper.lambda().le(MemberRevenue::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
- }
- if (pageWrap.getModel().getUpdateUser() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getUpdateUser, pageWrap.getModel().getUpdateUser());
- }
- if (pageWrap.getModel().getUpdateTime() != null) {
- queryWrapper.lambda().ge(MemberRevenue::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
- queryWrapper.lambda().le(MemberRevenue::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getOptType() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getOptType, pageWrap.getModel().getOptType());
- }
- if (pageWrap.getModel().getAmount() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getAmount, pageWrap.getModel().getAmount());
- }
- if (pageWrap.getModel().getBeforeAmount() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getBeforeAmount, pageWrap.getModel().getBeforeAmount());
- }
- if (pageWrap.getModel().getAfterAmount() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getAfterAmount, pageWrap.getModel().getAfterAmount());
- }
- if (pageWrap.getModel().getObjId() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getObjId, pageWrap.getModel().getObjId());
- }
- if (pageWrap.getModel().getObjType() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getObjType, pageWrap.getModel().getObjType());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getStatus, pageWrap.getModel().getStatus());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ pageWrap.getModel().setDeleted(Constants.ZERO);
+ queryWrapper.eq(pageWrap.getModel().getId() != null,MemberRevenue::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(pageWrap.getModel().getDeleted() != null,MemberRevenue::getDeleted, pageWrap.getModel().getDeleted());
+ queryWrapper.eq(pageWrap.getModel().getCreateUser() != null,MemberRevenue::getCreateUser, pageWrap.getModel().getCreateUser());
+ queryWrapper.eq(pageWrap.getModel().getRemark() != null,MemberRevenue::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(pageWrap.getModel().getMemberId() != null,MemberRevenue::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.eq(pageWrap.getModel().getType() != null,MemberRevenue::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(pageWrap.getModel().getOptType() != null,MemberRevenue::getOptType, pageWrap.getModel().getOptType());
+ queryWrapper.eq(pageWrap.getModel().getObjId() != null,MemberRevenue::getObjId, pageWrap.getModel().getObjId());
+ queryWrapper.eq(pageWrap.getModel().getObjType() != null,MemberRevenue::getObjType, pageWrap.getModel().getObjType());
+ queryWrapper.eq(pageWrap.getModel().getStatus() != null,MemberRevenue::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getTransactionNo()),MemberRevenue::getTransactionNo, pageWrap.getModel().getTransactionNo());
+ queryWrapper.ge(pageWrap.getModel().getStartTime()!=null,MemberRevenue::getCreateTime,pageWrap.getModel().getStartTime());
+ queryWrapper.ne(pageWrap.getModel().getEndTime()!=null,MemberRevenue::getCreateTime,pageWrap.getModel().getEndTime());
+ queryWrapper.orderByDesc(MemberRevenue::getCreateTime);
+ PageData<MemberRevenue> result = PageData.from(memberRevenueMapper.selectJoinPage(page,MemberRevenue.class, queryWrapper));
+ if(result!=null && result.getRecords()!=null){
+ for(MemberRevenue model :result.getRecords()){
+ model.setTypeName(Constants.RevenueType.getObjName(model.getType()));
+ model.setAmountInfo(Constants.getFormatMoney(model.getAmount()));
}
}
- return PageData.from(memberRevenueMapper.selectPage(page, queryWrapper));
+ return result;
}
@Override
--
Gitblit v1.9.3