From 294af589e160806b3953440d2861a2b6a18f2f67 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 09 十月 2023 10:39:33 +0800
Subject: [PATCH] #pgsql 退款 结算
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 110 +++++++++++++++++++++++++++++--------------------------
1 files changed, 58 insertions(+), 52 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index d5aa6e3..2cc2a5e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -4,12 +4,16 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberRidesMapper;
+import com.doumee.dao.business.join.MemberRidesJoinMapper;
+import com.doumee.dao.business.model.BaseParam;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.service.business.MemberRidesService;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -26,6 +30,10 @@
@Autowired
private MemberRidesMapper memberRidesMapper;
+
+
+ @Autowired
+ private MemberRidesJoinMapper memberRidesJoinMapper;
@Override
public String create(MemberRides memberRides) {
@@ -83,136 +91,134 @@
QueryWrapper<MemberRides> wrapper = new QueryWrapper<>(memberRides);
return memberRidesMapper.selectList(wrapper);
}
-
+
@Override
public PageData<MemberRides> findPage(PageWrap<MemberRides> pageWrap) {
IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<MemberRides> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(MemberRides::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(MemberRides::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(MemberRides::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(MemberRides::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(MemberRides::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(MemberRides::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(MemberRides::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(MemberRides::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(MemberRides::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(MemberRides::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(MemberRides::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(MemberRides::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(MemberRides::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(MemberRides::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(MemberRides::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(MemberRides::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(MemberRides::getInfo, pageWrap.getModel().getInfo());
+ queryWrapper.eq(MemberRides::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(MemberRides::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.eq(MemberRides::getMemberId, pageWrap.getModel().getMemberId());
}
if (pageWrap.getModel().getBikeCode() != null) {
- queryWrapper.lambda().eq(MemberRides::getBikeCode, pageWrap.getModel().getBikeCode());
+ queryWrapper.eq(MemberRides::getBikeCode, pageWrap.getModel().getBikeCode());
}
if (pageWrap.getModel().getBalance() != null) {
- queryWrapper.lambda().eq(MemberRides::getBalance, pageWrap.getModel().getBalance());
+ queryWrapper.eq(MemberRides::getBalance, pageWrap.getModel().getBalance());
}
if (pageWrap.getModel().getParamId() != null) {
- queryWrapper.lambda().eq(MemberRides::getParamId, pageWrap.getModel().getParamId());
+ queryWrapper.eq(MemberRides::getParamId, pageWrap.getModel().getParamId());
}
if (pageWrap.getModel().getRentSiteId() != null) {
- queryWrapper.lambda().eq(MemberRides::getRentSiteId, pageWrap.getModel().getRentSiteId());
+ queryWrapper.eq(MemberRides::getRentSiteId, pageWrap.getModel().getRentSiteId());
}
if (pageWrap.getModel().getRentLockId() != null) {
- queryWrapper.lambda().eq(MemberRides::getRentLockId, pageWrap.getModel().getRentLockId());
+ queryWrapper.eq(MemberRides::getRentLockId, pageWrap.getModel().getRentLockId());
}
if (pageWrap.getModel().getRentDate() != null) {
- queryWrapper.lambda().ge(MemberRides::getRentDate, Utils.Date.getStart(pageWrap.getModel().getRentDate()));
- queryWrapper.lambda().le(MemberRides::getRentDate, Utils.Date.getEnd(pageWrap.getModel().getRentDate()));
+ queryWrapper.ge(MemberRides::getRentDate, Utils.Date.getStart(pageWrap.getModel().getRentDate()));
+ queryWrapper.le(MemberRides::getRentDate, Utils.Date.getEnd(pageWrap.getModel().getRentDate()));
}
if (pageWrap.getModel().getRentCommondD() != null) {
- queryWrapper.lambda().eq(MemberRides::getRentCommondD, pageWrap.getModel().getRentCommondD());
+ queryWrapper.eq(MemberRides::getRentCommondD, pageWrap.getModel().getRentCommondD());
}
if (pageWrap.getModel().getBackSiteId() != null) {
- queryWrapper.lambda().eq(MemberRides::getBackSiteId, pageWrap.getModel().getBackSiteId());
+ queryWrapper.eq(MemberRides::getBackSiteId, pageWrap.getModel().getBackSiteId());
}
if (pageWrap.getModel().getBackLockId() != null) {
- queryWrapper.lambda().eq(MemberRides::getBackLockId, pageWrap.getModel().getBackLockId());
+ queryWrapper.eq(MemberRides::getBackLockId, pageWrap.getModel().getBackLockId());
}
if (pageWrap.getModel().getBackDate() != null) {
- queryWrapper.lambda().ge(MemberRides::getBackDate, Utils.Date.getStart(pageWrap.getModel().getBackDate()));
- queryWrapper.lambda().le(MemberRides::getBackDate, Utils.Date.getEnd(pageWrap.getModel().getBackDate()));
+ queryWrapper.ge(MemberRides::getBackDate, Utils.Date.getStart(pageWrap.getModel().getBackDate()));
+ queryWrapper.le(MemberRides::getBackDate, Utils.Date.getEnd(pageWrap.getModel().getBackDate()));
}
if (pageWrap.getModel().getBackCommondId() != null) {
- queryWrapper.lambda().eq(MemberRides::getBackCommondId, pageWrap.getModel().getBackCommondId());
+ queryWrapper.eq(MemberRides::getBackCommondId, pageWrap.getModel().getBackCommondId());
}
if (pageWrap.getModel().getBasePrice() != null) {
- queryWrapper.lambda().eq(MemberRides::getBasePrice, pageWrap.getModel().getBasePrice());
+ queryWrapper.eq(MemberRides::getBasePrice, pageWrap.getModel().getBasePrice());
}
if (pageWrap.getModel().getBaseTime() != null) {
- queryWrapper.lambda().eq(MemberRides::getBaseTime, pageWrap.getModel().getBaseTime());
+ queryWrapper.eq(MemberRides::getBaseTime, pageWrap.getModel().getBaseTime());
}
if (pageWrap.getModel().getUnitPrice() != null) {
- queryWrapper.lambda().eq(MemberRides::getUnitPrice, pageWrap.getModel().getUnitPrice());
+ queryWrapper.eq(MemberRides::getUnitPrice, pageWrap.getModel().getUnitPrice());
}
if (pageWrap.getModel().getUnitTime() != null) {
- queryWrapper.lambda().eq(MemberRides::getUnitTime, pageWrap.getModel().getUnitTime());
+ queryWrapper.eq(MemberRides::getUnitTime, pageWrap.getModel().getUnitTime());
}
if (pageWrap.getModel().getPrice() != null) {
- queryWrapper.lambda().eq(MemberRides::getPrice, pageWrap.getModel().getPrice());
+ queryWrapper.eq(MemberRides::getPrice, pageWrap.getModel().getPrice());
}
if (pageWrap.getModel().getActualPrice() != null) {
- queryWrapper.lambda().eq(MemberRides::getActualPrice, pageWrap.getModel().getActualPrice());
+ queryWrapper.eq(MemberRides::getActualPrice, pageWrap.getModel().getActualPrice());
}
if (pageWrap.getModel().getDuration() != null) {
- queryWrapper.lambda().eq(MemberRides::getDuration, pageWrap.getModel().getDuration());
+ queryWrapper.eq(MemberRides::getDuration, pageWrap.getModel().getDuration());
}
if (pageWrap.getModel().getCloseDate() != null) {
- queryWrapper.lambda().ge(MemberRides::getCloseDate, Utils.Date.getStart(pageWrap.getModel().getCloseDate()));
- queryWrapper.lambda().le(MemberRides::getCloseDate, Utils.Date.getEnd(pageWrap.getModel().getCloseDate()));
+ queryWrapper.ge(MemberRides::getCloseDate, Utils.Date.getStart(pageWrap.getModel().getCloseDate()));
+ queryWrapper.le(MemberRides::getCloseDate, Utils.Date.getEnd(pageWrap.getModel().getCloseDate()));
}
if (pageWrap.getModel().getCloseStatus() != null) {
- queryWrapper.lambda().eq(MemberRides::getCloseStatus, pageWrap.getModel().getCloseStatus());
+ queryWrapper.eq(MemberRides::getCloseStatus, pageWrap.getModel().getCloseStatus());
}
if (pageWrap.getModel().getOrdreId() != null) {
- queryWrapper.lambda().eq(MemberRides::getOrdreId, pageWrap.getModel().getOrdreId());
+ queryWrapper.eq(MemberRides::getOrdreId, pageWrap.getModel().getOrdreId());
}
if (pageWrap.getModel().getIsStandard() != null) {
- queryWrapper.lambda().eq(MemberRides::getIsStandard, pageWrap.getModel().getIsStandard());
+ queryWrapper.eq(MemberRides::getIsStandard, pageWrap.getModel().getIsStandard());
}
if (pageWrap.getModel().getPricingDetailId() != null) {
- queryWrapper.lambda().eq(MemberRides::getPricingDetailId, pageWrap.getModel().getPricingDetailId());
+ queryWrapper.eq(MemberRides::getPricingDetailId, pageWrap.getModel().getPricingDetailId());
}
if (pageWrap.getModel().getIsHoliday() != null) {
- queryWrapper.lambda().eq(MemberRides::getIsHoliday, pageWrap.getModel().getIsHoliday());
+ queryWrapper.eq(MemberRides::getIsHoliday, pageWrap.getModel().getIsHoliday());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(MemberRides::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(MemberRides::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getBackType() != null) {
- queryWrapper.lambda().eq(MemberRides::getBackType, pageWrap.getModel().getBackType());
+ queryWrapper.eq(MemberRides::getBackType, pageWrap.getModel().getBackType());
}
if (pageWrap.getModel().getBackReason() != null) {
- queryWrapper.lambda().eq(MemberRides::getBackReason, pageWrap.getModel().getBackReason());
+ queryWrapper.eq(MemberRides::getBackReason, pageWrap.getModel().getBackReason());
}
if (pageWrap.getModel().getBackInfo() != null) {
- queryWrapper.lambda().eq(MemberRides::getBackInfo, pageWrap.getModel().getBackInfo());
+ queryWrapper.eq(MemberRides::getBackInfo, pageWrap.getModel().getBackInfo());
}
if (pageWrap.getModel().getBackUserid() != null) {
- queryWrapper.lambda().eq(MemberRides::getBackUserid, pageWrap.getModel().getBackUserid());
+ queryWrapper.eq(MemberRides::getBackUserid, pageWrap.getModel().getBackUserid());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(memberRidesMapper.selectPage(page, queryWrapper));
+ queryWrapper.orderByDesc(MemberRides::getCreateDate);
+
+ queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
+ .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
+ .leftJoin()
+ return PageData.from(memberRidesJoinMapper.selectPage(page, queryWrapper));
}
@Override
--
Gitblit v1.9.3