From 659aa756d96f4d0f3db335a7a7e838e7cdc79afc Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 28 十月 2023 17:11:14 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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 24b3669..7fe93bc 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
@@ -189,6 +189,15 @@
public PageData<BikeLogDTO> findBikeLog(PageWrap<MemberRidesQuery> pageWrap) {
IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap.getModel());
+ MemberRidesQuery model = pageWrap.getModel();
+ //宸茶繕杞�
+ if (Objects.nonNull(model.getHasBack()) && model.getHasBack()){
+ queryWrapper.eq(MemberRides::getStatus,Constants.TWO);
+ }
+ //鏈綊杩樼殑
+ if (Objects.nonNull(model.getHasBack()) && !model.getHasBack()){
+ queryWrapper.eq(MemberRides::getStatus,Constants.ONE);
+ }
IPage<BikeLogDTO> bikeLogDTOIPage = memberRidesJoinMapper.selectJoinPage(page, BikeLogDTO.class, queryWrapper);
initBikeLogObj(bikeLogDTOIPage.getRecords());
return PageData.from(bikeLogDTOIPage);
@@ -217,8 +226,12 @@
.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
.like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
.like(StringUtils.isNotBlank(model.getBikeCode()),MemberRides::getBikeCode,model.getBikeCode());
- queryWrapper.ge(model.getStartDate()!=null, MemberRides::getRentDate,model.getStartDate());
- queryWrapper.le(model.getEndDate()!=null, MemberRides::getRentDate,model.getEndDate());
+ if (Objects.nonNull(model.getStartDate())) {
+ queryWrapper.ge(MemberRides::getRentDate, Utils.Date.getStart(model.getStartDate()));
+ }
+ if (Objects.nonNull(model.getEndDate())) {
+ queryWrapper.le(MemberRides::getRentDate, Utils.Date.getEnd(model.getEndDate()));
+ }
queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
queryWrapper.eq(model.getStatus()!=null,MemberRides::getStatus, model.getStatus());
queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
@@ -674,6 +687,7 @@
Date date =new Date();
//妫�鏌ョ珯鐐逛俊鎭紝涓嶅瓨鍦ㄥ垯鏂板
Sites sites = sitesMapper.selectById(locks.getSiteId());
+
if(sites == null){
sites = new Sites();
sites.setIsdeleted(Constants.ZERO);
@@ -687,6 +701,15 @@
//鏂板閿佸ご
sitesMapper.insert(sites);
}
+ if(StringUtils.isNotBlank(locks.getBikeCode())){
+ UpdateWrapper<Locks> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.lambda().set(Locks::getBikeCode, null );
+ updateWrapper.lambda().set(Locks::getEditDate, new Date() );
+ updateWrapper.lambda().eq(Locks::getBikeCode, locks.getBikeCode() );
+ //娓呯┖鍘熸潵鐨勮嚜琛岃溅缁戝畾鍏崇郴
+ locksMapper.update(null, updateWrapper);
+ }
+
if(model == null){
//濡傛灉閿佸ご涓嶅瓨鍦紝鍒ゆ柇瀛樺偍
model = new Locks();
@@ -699,6 +722,13 @@
model.setCreateDate(date);
model.setStatus(locks.getStatus());
locksMapper.insert(model);
+ //鏇存柊 绔欑偣閿佸ご鏁伴噺
+ if(Objects.nonNull(sites)){
+ Sites sites1 = new Sites();
+ sites1.setId(sites.getId());
+ sites1.setLockNum(sites.getLockNum()+1);
+ sitesMapper.updateById(sites1);
+ }
}else{
UpdateWrapper<Locks> updateWrapper = new UpdateWrapper<Locks>();
updateWrapper.lambda().eq(Locks::getCode, locks.getCode() );
--
Gitblit v1.9.3