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 | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 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 e4c54a6..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,6 +1,9 @@
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;
@@ -11,8 +14,10 @@
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;
@@ -41,6 +46,9 @@
@Autowired
private MemberRidesJoinMapper memberRidesJoinMapper;
+
+ @Autowired
+ private DeviceService deviceService;
@Override
public String create(MemberRides memberRides) {
@@ -145,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