From cc3bbf14c5fde619c23e5502c8583889e94deacc Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 25 十月 2023 09:58:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 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 2b0c3d3..4560cf1 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
@@ -217,10 +217,14 @@
.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.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
- queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
+ queryWrapper.ge(model.getStartDate()!=null, MemberRides::getRentDate,model.getStartDate());
+ queryWrapper.le(model.getEndDate()!=null, MemberRides::getRentDate,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());
+// queryWrapper.eq(MemberRides::getBackType, Constants.ZERO);
+ queryWrapper.in(MemberRides::getStatus,
+ Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
queryWrapper
.selectAs(MemberRides::getId,MemberRidesDTO::getId)
.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
@@ -232,7 +236,9 @@
.selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
.selectAs(MemberRides::getRentLockId,MemberRidesDTO::getRentLockId)
.selectAs(MemberRides::getRentSiteId,MemberRidesDTO::getRentSiteId)
- .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
+ .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate)
+ .selectAs(MemberRides::getBackSiteId,MemberRidesDTO::getBackSiteId)
+ .selectAs(MemberRides::getBackLockId,MemberRidesDTO::getBackLockId);
return queryWrapper;
}
@@ -267,7 +273,7 @@
throw new BusinessException( ResponseStatus.DATA_EMPTY );
}
if(Constants.formatIntegerNum(model.getStatus()) != Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()||
- Constants.formatIntegerNum(model.getCloseStatus()) != Constants.ONE){
+ Constants.formatIntegerNum(model.getCloseStatus()) != Constants.ZERO){
throw new BusinessException( ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍙兘閽堝宸茶繕杞︿笖鏈粨绠楃殑鏁版嵁杩涜鎿嶄綔锛�" );
}
if(Constants.formatIntegerNum(memberRides.getDuration()) == Constants.formatIntegerNum(model.getDuration())){
@@ -293,17 +299,17 @@
log.setActInfo(memberRides.getBackInfo());
log.setActReason(memberRides.getBackReason());
log.setIsdeleted(Constants.ZERO);
- log.setCreateDate(update.getBackDate());
+ log.setCreateDate(new Date());
log.setCreator(user.getId());
log.setBeforeContent(beforeContent);
log.setAfterContent(after);
log.setUserId(user.getId());
log.setUserType(Constants.ONE);
log.setParam(JSONObject.toJSONString(memberRides ));
- log.setType(Constants.ActionLogObjType.memberrides);
+ log.setObjType(Constants.ActionLogObjType.memberrides);
log.setResult(Constants.ZERO);
log.setObjId(model.getId());
- log.setObjType(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getKey());
+ log.setType(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getKey());
log.setContent(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getInfo());
log.setTitle(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getName());
//璁板綍鎿嶄綔鏃ュ織
@@ -332,7 +338,7 @@
}
QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK));
+ .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK,Constants.FREE_RENT_TIME));
List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s));
@@ -348,8 +354,11 @@
update.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());
update.setBackSiteId(collect.get(Constants.FORCE_BACK_SITE).getCode());
update.setBackLockId(collect.get(Constants.FORCE_BACK_LOCK).getCode());
+ Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
+ Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate());
//璁＄畻楠戣璁¤垂鏃堕暱
- update.setDuration(DateUtil.betweenMin(model.getRentDate(), update.getBackDate()));
+ update.setDuration( rideTime > freeRentTime ? rideTime : 0 );
+ //update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime);
memberRidesMapper.updateById(update);
//淇敼鍓�
String beforeContent = JSONObject.toJSONString(model);
@@ -374,17 +383,17 @@
ActionLog log = new ActionLog();
log.setId(Constants.getUUID());
log.setIsdeleted(Constants.ZERO);
- log.setCreateDate(update.getBackDate());
+ log.setCreateDate(new Date());
log.setCreator(user.getId());
log.setBeforeContent(beforeContent);
log.setAfterContent(after);
log.setUserId(user.getId());
log.setUserType(Constants.ONE);
log.setParam(JSONObject.toJSONString(memberRides ));
- log.setType(Constants.ActionLogObjType.memberrides);
+ log.setObjType(Constants.ActionLogObjType.memberrides);
log.setResult(Constants.ZERO);
log.setObjId(model.getId());
- log.setObjType(Constants.ACTIONLOG_TYPE.FORCE_BACK.getKey());
+ log.setType(Constants.ACTIONLOG_TYPE.FORCE_BACK.getKey());
log.setContent(Constants.ACTIONLOG_TYPE.FORCE_BACK.getInfo());
log.setTitle(Constants.ACTIONLOG_TYPE.FORCE_BACK.getName());
log.setActInfo(memberRides.getBackInfo());
@@ -472,7 +481,6 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曪紒");
}
Date date =new Date();
-
QueryWrapper<PricingParam> param = new QueryWrapper<>();
param.lambda().eq(PricingParam::getStatus,Constants.ZERO);
param.lambda().eq(PricingParam::getIsdeleted,Constants.ZERO);
@@ -573,34 +581,36 @@
}
private Bikes dealBikesByParam(Locks model) {
+ if(StringUtils.isNotBlank(model.getBikeCode())){
+ UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.lambda().set(Bikes::getCode, null );
+ updateWrapper.lambda().set(Bikes::getParamId, null );
+ updateWrapper.lambda().set(Bikes::getEditDate, new Date() );
+ updateWrapper.lambda().eq(Bikes::getCode, model.getBikeCode() );
+ //娓呯┖鍘熸潵鐨勮嚜琛岃溅缁戝畾鍏崇郴
+ bikesMapper.update(null, updateWrapper);
+ }
+
QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(Bikes::getLockId, model.getCode());
wrapper.lambda().eq(Bikes::getSiteId, model.getSiteId());
Bikes bikes = bikesMapper.selectOne(wrapper.last("limit 1"));
if(bikes != null ) {
- if ( StringUtils.equals(model.getBikeCode(), bikes.getCode())){
+ if ( !StringUtils.equals(model.getBikeCode(), bikes.getCode())){
//濡傛灉缁戝畾杞﹁締淇℃伅鍙戠敓缂栧彿锛屾洿鎹㈢粦瀹氬叧绯�
UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
- updateWrapper.lambda().set(Bikes::getId, bikes.getId());
+ updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
updateWrapper.lambda().set(Bikes::getParamId,getBileTypeByCode(model.getBikeCode()));
//鏇存柊鑷绔欑偣閿佸ご缁戝畾鑷杞︿俊鎭�
- bikesMapper.updateById(bikes);
+ bikesMapper.update(null,updateWrapper);
}
}else{
- if(StringUtils.isNotBlank(model.getBikeCode())){
- UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
- updateWrapper.lambda().set(Bikes::getCode, null );
- updateWrapper.lambda().set(Bikes::getParamId, null );
- updateWrapper.lambda().set(Bikes::getEditDate, new Date() );
- updateWrapper.lambda().eq(Bikes::getCode, model.getCode() );
- //娓呯┖鍘熸潵鐨勮嚜琛岃溅缁戝畾鍏崇郴
- bikesMapper.update(null, updateWrapper);
- }
bikes = new Bikes();
bikes.setId(Constants.getUUID());
bikes.setIsdeleted(Constants.ZERO);
bikes.setCreateDate(new Date());
+ bikes.setEditDate(bikes.getCreateDate());
bikes.setSiteId(model.getSiteId());
bikes.setLockId(model.getCode());
bikes.setCode(model.getBikeCode());
@@ -621,7 +631,7 @@
return null;
}
String type = bikeCode.substring(0,1);
- if(Constants.BIKE_TYPE.contains(type)){
+ if(!Constants.BIKE_TYPE.contains(type)){
return null;
}
BaseParam param = new BaseParam();
@@ -649,6 +659,7 @@
sites.setCode(locks.getSiteId());
sites.setId(locks.getSiteId());
sites.setCreateDate(date);
+ sites.setEditDate(date);
sites.setStatus(Constants.ZERO);
sites.setEditDate(date);
sites.setLockNum(1);
@@ -675,7 +686,6 @@
updateWrapper.lambda().set(Locks::getStatus, locks.getStatus() );
updateWrapper.lambda().set(Locks::getEditDate, new Date() );
updateWrapper.lambda().set(Locks::getIsdeleted, Constants.ZERO);
-
locksMapper.update(null,updateWrapper);
}
model.setSites(sites);
@@ -721,23 +731,26 @@
update.setBackLockId(param.getBackLockId());
update.setBackSiteId(param.getBackSiteId());
update.setBackCommondId(param.getBackCommondId());
- int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
+// int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
+ int min = DateUtil.betweenMin(memberRides.getRentDate(),date);//瀹為檯楠戣鏃堕棿
+ int duration = min>freeTime?min:0;
update.setDuration(duration>0?duration:0);
update.setBackType(Constants.ONE);
update.setBackInfo("鐢ㄦ埛姝ｅ父杩樿溅");
+ update.setId(memberRides.getId());
Bikes bikes = new Bikes();
bikes.setSiteId(memberRides.getBackSiteId());
bikes.setLockId(memberRides.getBackLockId());
// bikes.setCode(memberRides.getBikeCode());
- bikes = bikesMapper.selectById(new QueryWrapper<>(bikes).last("limit 1"));
+ bikes = bikesMapper.selectOne(new QueryWrapper<>(bikes).last("limit 1"));
if(bikes != null ) {
UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
- updateWrapper.lambda().set(Bikes::getId, bikes.getId());
+ updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
updateWrapper.lambda().set(Bikes::getEditDate,new Date());
updateWrapper.lambda().set(Bikes::getLastBackDate,new Date());
//鏇存柊鑷杞︽渶鍚庤繕杞︽椂闂�
- bikesMapper.updateById(bikes);
+ bikesMapper.update(null,updateWrapper);
}
//鏇存柊杩樿溅璁板綍涓哄凡杩樿溅
memberRidesMapper.updateById(update);
--
Gitblit v1.9.3