From 580cead2bc3a8502cd9bdd098df02345c0616b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 12:12:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 245 ++++++++++++++++++++++++-------------------------
1 files changed, 120 insertions(+), 125 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..4d28930 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,20 +1,36 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+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.BikeLogDTO;
+import com.doumee.dao.business.web.response.MemberRidesDTO;
+import com.doumee.dao.business.web.response.MemberRidesQuery;
+import com.doumee.service.business.DeviceService;
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瀹炵幇
@@ -26,6 +42,13 @@
@Autowired
private MemberRidesMapper memberRidesMapper;
+
+
+ @Autowired
+ private MemberRidesJoinMapper memberRidesJoinMapper;
+
+ @Autowired
+ private DeviceService deviceService;
@Override
public String create(MemberRides memberRides) {
@@ -83,136 +106,45 @@
QueryWrapper<MemberRides> wrapper = new QueryWrapper<>(memberRides);
return memberRidesMapper.selectList(wrapper);
}
-
+
@Override
- public PageData<MemberRides> findPage(PageWrap<MemberRides> pageWrap) {
+ public PageData<MemberRidesDTO> findPage(PageWrap<MemberRidesQuery> 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.orderByDesc(MemberRides::getCreateDate);
+ queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
+ .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
+ .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());
}
- 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.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()));
+ }
+ });
}
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().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()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(MemberRides::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(MemberRides::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(MemberRides::getInfo, pageWrap.getModel().getInfo());
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(MemberRides::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getBikeCode() != null) {
- queryWrapper.lambda().eq(MemberRides::getBikeCode, pageWrap.getModel().getBikeCode());
- }
- if (pageWrap.getModel().getBalance() != null) {
- queryWrapper.lambda().eq(MemberRides::getBalance, pageWrap.getModel().getBalance());
- }
- if (pageWrap.getModel().getParamId() != null) {
- queryWrapper.lambda().eq(MemberRides::getParamId, pageWrap.getModel().getParamId());
- }
- if (pageWrap.getModel().getRentSiteId() != null) {
- queryWrapper.lambda().eq(MemberRides::getRentSiteId, pageWrap.getModel().getRentSiteId());
- }
- if (pageWrap.getModel().getRentLockId() != null) {
- queryWrapper.lambda().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()));
- }
- if (pageWrap.getModel().getRentCommondD() != null) {
- queryWrapper.lambda().eq(MemberRides::getRentCommondD, pageWrap.getModel().getRentCommondD());
- }
- if (pageWrap.getModel().getBackSiteId() != null) {
- queryWrapper.lambda().eq(MemberRides::getBackSiteId, pageWrap.getModel().getBackSiteId());
- }
- if (pageWrap.getModel().getBackLockId() != null) {
- queryWrapper.lambda().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()));
- }
- if (pageWrap.getModel().getBackCommondId() != null) {
- queryWrapper.lambda().eq(MemberRides::getBackCommondId, pageWrap.getModel().getBackCommondId());
- }
- if (pageWrap.getModel().getBasePrice() != null) {
- queryWrapper.lambda().eq(MemberRides::getBasePrice, pageWrap.getModel().getBasePrice());
- }
- if (pageWrap.getModel().getBaseTime() != null) {
- queryWrapper.lambda().eq(MemberRides::getBaseTime, pageWrap.getModel().getBaseTime());
- }
- if (pageWrap.getModel().getUnitPrice() != null) {
- queryWrapper.lambda().eq(MemberRides::getUnitPrice, pageWrap.getModel().getUnitPrice());
- }
- if (pageWrap.getModel().getUnitTime() != null) {
- queryWrapper.lambda().eq(MemberRides::getUnitTime, pageWrap.getModel().getUnitTime());
- }
- if (pageWrap.getModel().getPrice() != null) {
- queryWrapper.lambda().eq(MemberRides::getPrice, pageWrap.getModel().getPrice());
- }
- if (pageWrap.getModel().getActualPrice() != null) {
- queryWrapper.lambda().eq(MemberRides::getActualPrice, pageWrap.getModel().getActualPrice());
- }
- if (pageWrap.getModel().getDuration() != null) {
- queryWrapper.lambda().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()));
- }
- if (pageWrap.getModel().getCloseStatus() != null) {
- queryWrapper.lambda().eq(MemberRides::getCloseStatus, pageWrap.getModel().getCloseStatus());
- }
- if (pageWrap.getModel().getOrdreId() != null) {
- queryWrapper.lambda().eq(MemberRides::getOrdreId, pageWrap.getModel().getOrdreId());
- }
- if (pageWrap.getModel().getIsStandard() != null) {
- queryWrapper.lambda().eq(MemberRides::getIsStandard, pageWrap.getModel().getIsStandard());
- }
- if (pageWrap.getModel().getPricingDetailId() != null) {
- queryWrapper.lambda().eq(MemberRides::getPricingDetailId, pageWrap.getModel().getPricingDetailId());
- }
- if (pageWrap.getModel().getIsHoliday() != null) {
- queryWrapper.lambda().eq(MemberRides::getIsHoliday, pageWrap.getModel().getIsHoliday());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(MemberRides::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getBackType() != null) {
- queryWrapper.lambda().eq(MemberRides::getBackType, pageWrap.getModel().getBackType());
- }
- if (pageWrap.getModel().getBackReason() != null) {
- queryWrapper.lambda().eq(MemberRides::getBackReason, pageWrap.getModel().getBackReason());
- }
- if (pageWrap.getModel().getBackInfo() != null) {
- queryWrapper.lambda().eq(MemberRides::getBackInfo, pageWrap.getModel().getBackInfo());
- }
- if (pageWrap.getModel().getBackUserid() != null) {
- queryWrapper.lambda().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));
+ return PageData.from(memberRidesDTOIPage);
}
@Override
@@ -221,5 +153,68 @@
return memberRidesMapper.selectCount(wrapper);
}
+ @Override
+ public PageData<BikeLogDTO> findBikeLog(PageWrap<MemberRidesQuery> pageWrap) {
+
+ IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.orderByDesc(MemberRides::getCreateDate);
+ queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
+ .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
+ .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().getHasBack())
+ && pageWrap.getModel().getHasBack()){
+ queryWrapper.isNotNull(MemberRides::getBackDate);
+ }else if (Objects.nonNull(pageWrap.getModel().getStatus())
+ && !pageWrap.getModel().getHasBack()){
+ queryWrapper.isNull(MemberRides::getBackDate);
+ }
+ queryWrapper.orderByDesc(MemberRides::getCreateDate);
+ queryWrapper.leftJoin("locks rl on rl.id = t.rent_lock_id and rl.site_id = t.rent_site_id")
+ .leftJoin("sites rs on rs.id = rl.site_id")
+ .leftJoin("locks bl on bl.id = t.rent_lock_id and bl.site_id = t.rent_site_id")
+ .leftJoin("sites bs on bs.id = rl.site_id");
+ queryWrapper.selectAs(Member::getOpenid,BikeLogDTO::getOpenid)
+ .selectAs(MemberRides::getBikeCode,BikeLogDTO::getBikeCode)
+ .selectAs(BaseParam::getName,BikeLogDTO::getBikeType)
+ .selectAs(MemberRides::getRentDate,BikeLogDTO::getRentDate)
+ .selectAs(MemberRides::getBackDate,BikeLogDTO::getBackDate)
+ .select("rs.Name as rentSiteName, rl.name as rentLockName")
+ .select("bs.Name as backSiteName, bl.name as backLockName");
+
+ IPage<BikeLogDTO> bikeLogDTOIPage = memberRidesJoinMapper.selectJoinPage(page, BikeLogDTO.class, queryWrapper);
+ if (!CollectionUtils.isEmpty(bikeLogDTOIPage.getRecords())){
+ bikeLogDTOIPage.getRecords().forEach(s->{
+ if (Objects.nonNull(s.getBackDate())){
+ s.setRideTime(DateUtil.betweenMin(s.getRentDate(),s.getBackDate()));
+ }
+ });
+ }
+ return PageData.from(bikeLogDTOIPage);
+ }
+
+ @Override
+ public String getOnlineBike(String memberId){
+ MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>()
+ .eq("isdeleted", Constants.ZERO)
+ .eq("member_id",memberId)
+ .eq("status",Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey())
+ .last(" limit 1 ")
+ );
+ if(Objects.isNull(memberRides)){
+ return null;
+ }
+ return memberRides.getBikeCode();
+ }
+
+
+
+
}
--
Gitblit v1.9.3