From 55642c818f14bf8cf52c98e6858014bd8dc3d3a7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 16 四月 2026 20:10:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 a24c980..bdeeffe 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
@@ -7,7 +7,6 @@
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;
@@ -98,9 +97,7 @@
.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);
+ .leftJoin(Member.class,Member::getId,MemberRevenue::getMemberId);
Utils.MP.blankToNull(pageWrap.getModel());
pageWrap.getModel().setDeleted(Constants.ZERO);
queryWrapper.eq(pageWrap.getModel().getId() != null,MemberRevenue::getId, pageWrap.getModel().getId());
@@ -120,7 +117,7 @@
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.setTypeName(null);
model.setAmountInfo(Constants.getFormatMoney(model.getAmount()));
}
}
--
Gitblit v1.9.3