From b60ba5f6644e98c63de7367fdce9b82e45f058e9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 09 十月 2023 14:10:37 +0800
Subject: [PATCH] #pgsql 退款 结算
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 158 ++++++++++++----------------------------------------
1 files changed, 38 insertions(+), 120 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 2cc2a5e..e4c54a6 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
@@ -1,24 +1,31 @@
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.DateUtil;
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.Goodsorder;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRides;
+import com.doumee.dao.business.web.response.MemberRidesDTO;
+import com.doumee.dao.business.web.response.MemberRidesQuery;
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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鐢ㄦ埛楠戣璁板綍琛⊿ervice瀹炵幇
@@ -93,132 +100,43 @@
}
@Override
- public PageData<MemberRides> findPage(PageWrap<MemberRides> pageWrap) {
+ public PageData<MemberRidesDTO> findPage(PageWrap<MemberRidesQuery> pageWrap) {
IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.eq(MemberRides::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- 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.eq(MemberRides::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- 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.eq(MemberRides::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.eq(MemberRides::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.eq(MemberRides::getInfo, pageWrap.getModel().getInfo());
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.eq(MemberRides::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getBikeCode() != null) {
- queryWrapper.eq(MemberRides::getBikeCode, pageWrap.getModel().getBikeCode());
- }
- if (pageWrap.getModel().getBalance() != null) {
- queryWrapper.eq(MemberRides::getBalance, pageWrap.getModel().getBalance());
- }
- if (pageWrap.getModel().getParamId() != null) {
- queryWrapper.eq(MemberRides::getParamId, pageWrap.getModel().getParamId());
- }
- if (pageWrap.getModel().getRentSiteId() != null) {
- queryWrapper.eq(MemberRides::getRentSiteId, pageWrap.getModel().getRentSiteId());
- }
- if (pageWrap.getModel().getRentLockId() != null) {
- queryWrapper.eq(MemberRides::getRentLockId, pageWrap.getModel().getRentLockId());
- }
- if (pageWrap.getModel().getRentDate() != null) {
- 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.eq(MemberRides::getRentCommondD, pageWrap.getModel().getRentCommondD());
- }
- if (pageWrap.getModel().getBackSiteId() != null) {
- queryWrapper.eq(MemberRides::getBackSiteId, pageWrap.getModel().getBackSiteId());
- }
- if (pageWrap.getModel().getBackLockId() != null) {
- queryWrapper.eq(MemberRides::getBackLockId, pageWrap.getModel().getBackLockId());
- }
- if (pageWrap.getModel().getBackDate() != null) {
- 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.eq(MemberRides::getBackCommondId, pageWrap.getModel().getBackCommondId());
- }
- if (pageWrap.getModel().getBasePrice() != null) {
- queryWrapper.eq(MemberRides::getBasePrice, pageWrap.getModel().getBasePrice());
- }
- if (pageWrap.getModel().getBaseTime() != null) {
- queryWrapper.eq(MemberRides::getBaseTime, pageWrap.getModel().getBaseTime());
- }
- if (pageWrap.getModel().getUnitPrice() != null) {
- queryWrapper.eq(MemberRides::getUnitPrice, pageWrap.getModel().getUnitPrice());
- }
- if (pageWrap.getModel().getUnitTime() != null) {
- queryWrapper.eq(MemberRides::getUnitTime, pageWrap.getModel().getUnitTime());
- }
- if (pageWrap.getModel().getPrice() != null) {
- queryWrapper.eq(MemberRides::getPrice, pageWrap.getModel().getPrice());
- }
- if (pageWrap.getModel().getActualPrice() != null) {
- queryWrapper.eq(MemberRides::getActualPrice, pageWrap.getModel().getActualPrice());
- }
- if (pageWrap.getModel().getDuration() != null) {
- queryWrapper.eq(MemberRides::getDuration, pageWrap.getModel().getDuration());
- }
- if (pageWrap.getModel().getCloseDate() != null) {
- 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.eq(MemberRides::getCloseStatus, pageWrap.getModel().getCloseStatus());
- }
- if (pageWrap.getModel().getOrdreId() != null) {
- queryWrapper.eq(MemberRides::getOrdreId, pageWrap.getModel().getOrdreId());
- }
- if (pageWrap.getModel().getIsStandard() != null) {
- queryWrapper.eq(MemberRides::getIsStandard, pageWrap.getModel().getIsStandard());
- }
- if (pageWrap.getModel().getPricingDetailId() != null) {
- queryWrapper.eq(MemberRides::getPricingDetailId, pageWrap.getModel().getPricingDetailId());
- }
- if (pageWrap.getModel().getIsHoliday() != null) {
- queryWrapper.eq(MemberRides::getIsHoliday, pageWrap.getModel().getIsHoliday());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.eq(MemberRides::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getBackType() != null) {
- queryWrapper.eq(MemberRides::getBackType, pageWrap.getModel().getBackType());
- }
- if (pageWrap.getModel().getBackReason() != null) {
- queryWrapper.eq(MemberRides::getBackReason, pageWrap.getModel().getBackReason());
- }
- if (pageWrap.getModel().getBackInfo() != null) {
- queryWrapper.eq(MemberRides::getBackInfo, pageWrap.getModel().getBackInfo());
- }
- if (pageWrap.getModel().getBackUserid() != null) {
- queryWrapper.eq(MemberRides::getBackUserid, pageWrap.getModel().getBackUserid());
- }
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));
+ .leftJoin(Goodsorder.class,Goodsorder::getId,MemberRides::getOrdreId)
+ .eq(BaseParam::getType, Constants.THREE)
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),MemberRides::getBikeCode,pageWrap.getModel().getBikeCode())
+ .between((Objects.nonNull(pageWrap.getModel().getRentDateStart())&&Objects.nonNull(pageWrap.getModel().getRentDateEnd())),
+ MemberRides::getRentDate,
+ pageWrap.getModel().getRentDateStart(),pageWrap.getModel().getRentDateEnd());
+ if (Objects.nonNull(pageWrap.getModel().getStatus())
+ && Constants.GOODSORDER_STATUS.CLOSE.getKey().equals(pageWrap.getModel().getStatus())){
+ queryWrapper.eq(Goodsorder::getStatus,pageWrap.getModel().getStatus());
+ }else if (Objects.nonNull(pageWrap.getModel().getStatus())
+ && !Constants.GOODSORDER_STATUS.CLOSE.getKey().equals(pageWrap.getModel().getStatus())){
+ queryWrapper.ne(Goodsorder::getStatus,pageWrap.getModel().getStatus());
+ }
+ queryWrapper.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
+ .selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
+ .selectAs(Goodsorder::getStatus,MemberRidesDTO::getStatus)
+ .selectAs(BaseParam::getName,MemberRidesDTO::getBikeType)
+ .selectAs(MemberRides::getDuration,MemberRidesDTO::getDuration)
+ .selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
+ .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
+ IPage<MemberRidesDTO> memberRidesDTOIPage = memberRidesJoinMapper.selectJoinPage(page, MemberRidesDTO.class, queryWrapper);
+ if (!CollectionUtils.isEmpty(memberRidesDTOIPage.getRecords())){
+ memberRidesDTOIPage.getRecords().forEach(s->{
+ if (Objects.nonNull(s.getBackDate())){
+ s.setRideTime(DateUtil.betweenMin(s.getRentDate(),s.getBackDate()));
+ }
+ });
+ }
+ return PageData.from(memberRidesDTOIPage);
}
@Override
--
Gitblit v1.9.3