From c96b05ab329834d16ec2aad7a35e66dfa02511c1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:40:34 +0800
Subject: [PATCH] #获取正常还车
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 355 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 291 insertions(+), 64 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 b342df0..c4bc82b 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
@@ -5,6 +5,7 @@
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.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -13,6 +14,10 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.ActionLogMapper;
+import com.doumee.dao.business.BikesMapper;
+import com.doumee.dao.business.LocksMapper;
+import com.doumee.dao.business.MemberRidesMapper;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
@@ -20,21 +25,25 @@
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
+import com.doumee.dao.system.SystemDictDataMapper;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.DeviceService;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.MemberRidesService;
+import com.doumee.service.system.SystemDictDataService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 鐢ㄦ埛楠戣璁板綍琛⊿ervice瀹炵幇
@@ -66,10 +75,19 @@
@Autowired
private SitesMapper sitesMapper;
@Autowired
+ private BaseParamMapper baseParamMapper;
+ @Autowired
private BikesMapper bikesMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ @Lazy
+ private GoodsorderService goodsorderService;
+
+
@Autowired
- private GoodsorderService goodsorderService;
+ private SystemDictDataMapper systemDictDataMapper;
@Override
public String create(MemberRides memberRides) {
@@ -160,7 +178,7 @@
MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId);
- queryWrapper.eq(MemberRides::getMemberId, id);
+ queryWrapper.eq(MemberRides::getId, id);
queryWrapper.selectAll(MemberRides.class);
queryWrapper.selectAs(BaseParam::getName,MemberRidesDTO::getBikeType) ;
queryWrapper.last("limit 1");
@@ -203,19 +221,28 @@
queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
- queryWrapper.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
+ 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)
.selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
.selectAs(MemberRides::getCloseStatus,MemberRidesDTO::getCloseStatus)
.selectAs(MemberRides::getStatus,MemberRidesDTO::getStatus)
.selectAs(BaseParam::getName,MemberRidesDTO::getBikeType)
.selectAs(MemberRides::getDuration,MemberRidesDTO::getDuration)
.selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
- .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
+ .selectAs(MemberRides::getRentLockId,MemberRidesDTO::getRentLockId)
+ .selectAs(MemberRides::getRentSiteId,MemberRidesDTO::getRentSiteId)
+ .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate)
+ .selectAs(MemberRides::getBackSiteId,MemberRidesDTO::getBackSiteId)
+ .selectAs(MemberRides::getBackLockId,MemberRidesDTO::getBackLockId);
return queryWrapper;
}
@Override
- public String getOnlineBike(String memberId){
+ public MemberRides getOnlineBike(String memberId){
MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>()
.eq("isdeleted", Constants.ZERO)
.eq("member_id",memberId)
@@ -225,7 +252,7 @@
if(Objects.isNull(memberRides)){
return null;
}
- return memberRides.getBikeCode();
+ return memberRides;
}
/**
@@ -235,7 +262,7 @@
@Override
public void updateDuration(MemberRides memberRides){
LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(StringUtils.isBlank(memberRides.getMemberId())
+ if(StringUtils.isBlank(memberRides.getId())
||StringUtils.isBlank(memberRides.getBackReason())
|| memberRides.getDuration() == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -296,10 +323,9 @@
*/
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
- public void forceBack(MemberRides memberRides){
+ public void forceBack(MemberRides memberRides){
LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(StringUtils.isBlank(memberRides.getMemberId())
- ||StringUtils.isBlank(memberRides.getBackReason())){
+ if(StringUtils.isBlank(memberRides.getBackReason())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
MemberRides model = findJoinById(memberRides.getId());
@@ -309,6 +335,12 @@
if(Constants.formatIntegerNum(model.getStatus()) != Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey() ){
throw new BusinessException( ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍙兘閽堝鏈繕杞﹁締杩涜寮哄埗杩樿溅鎿嶄綔锛�" );
}
+ QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK));
+ List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
+ Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s));
+
MemberRides update = new MemberRides();
update.setId(model.getId());
update.setEditDate(new Date());
@@ -318,6 +350,9 @@
update.setBackReason(memberRides.getBackReason());
update.setBackUserid(user.getId());
update.setBackType(Constants.ONE);
+ 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());
//璁＄畻楠戣璁¤垂鏃堕暱
update.setDuration(DateUtil.betweenMin(model.getRentDate(), update.getBackDate()));
memberRidesMapper.updateById(update);
@@ -326,6 +361,20 @@
//淇敼鍚�
String after = JSONObject.toJSONString(update);
+ //鎻掑叆铏氭嫙閿佸ご鍜岀珯鐐逛笂-------
+ Bikes bike = new Bikes();
+ bike.setIsdeleted(Constants.ZERO);
+ bike.setCode(model.getBikeCode());
+ bike.setSiteId(update.getBackSiteId());
+ bike.setLockId(update.getBackLockId());
+ if(bikesMapper.selectCount(new QueryWrapper<>(bike)) == 0){
+ bike.setId(Constants.getUUID());
+ bike.setParamId(model.getParamId());
+ bike.setLastBackDate(model.getRentDate());
+ bike.setStatus(Constants.ZERO);
+ bike.setInfo("寮哄埗杩樿溅缁戝畾");
+ bikesMapper.insert(bike);
+ }
ActionLog log = new ActionLog();
log.setId(Constants.getUUID());
@@ -352,46 +401,131 @@
@Override
- public MemberRidesDetailResponse openLock(String code,String memberId){
+ public MemberRidesDetailResponse openLock(String code,String memberId) {
+ if(StringUtils.isBlank(code) || code.split("/").length != 2){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ョ珯鐐圭紪鍙蜂笉瀛樺湪锛岃灏濊瘯鏇存崲杞﹁締锛�");
+ }
//鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲�
Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
- .eq("isdeleted",Constants.ZERO)
- .eq("status",Constants.goodsorderStatus.pay)
- .eq("member_id",memberId)
+ .eq("isdeleted", Constants.ZERO)
+ .eq("status", Constants.goodsorderStatus.pay)
+ .eq("member_id", memberId)
.orderByDesc("create_date")
.last("limit 1"));
- if(Objects.isNull(goodsorder)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈敮浠樻娂閲戯紝鏃犳硶杩涜璇ユ搷浣滐紒");
+ if (Objects.isNull(goodsorder)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏈敮浠樻娂閲戯紝鏃犳硶杩涜璇ユ搷浣滐紒");
}
//鍒ゆ柇褰撳墠鎶奸噾璁㈠崟鏄惁涓轰粖鏃ユ娂閲�
- if(!DateUtil.DateToStr(goodsorder.getPayDate(),"yyyy-MM-dd").equals(DateUtil.getDate(new Date(),"yyyy-MM-dd"))){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰粖鏃ユ娂閲戣鍗曪紝璇风粨绠楀悗閲嶆柊鏀粯锛�");
+ if (!DateUtil.DateToStr(goodsorder.getPayDate(), "yyyy-MM-dd").equals(DateUtil.getDate(new Date(), "yyyy-MM-dd"))) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "闈炰粖鏃ユ娂閲戣鍗曪紝璇风粨绠楀悗閲嶆柊鏀粯锛�");
}
//鍒ゆ柇鏄惁澶勪簬钀ヤ笟鏃堕棿
goodsorderService.checkBusiness();
//鏌ヨ鏄惁澶勪簬楠戣涓�
- if(memberRidesMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id",memberId).in("status",0,1))>Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜");
- };
- Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>().eq("code",code).eq("isdeleted", Constants.ZERO).last("limit 1"));
- MqttLog flag = deviceService.openLock(locks);
- if(flag.getResult() == 0){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寮�閿佸け璐�");
+ if (memberRidesMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", memberId).in("status", 0, 1)) > Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜");
}
- //瀛樺偍楠戣璁板綍
+ String[] codes = code.split("/");
+ Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>()
+ .lambda().eq(Locks::getCode, codes[1])
+ .eq(Locks::getSiteId, codes[0])
+ .eq(Locks::getIsdeleted, Constants.ZERO)
+ .last("limit 1"));
+ if (Objects.isNull(locks)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛屾湭鏌ヨ鍒伴攣澶翠俊鎭�");
+ }
+ //鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝ｅ父
+ if (Constants.formatIntegerNum(locks.getStatus())!=Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠鎵爜閿佸ご鐘舵�侀敊璇紝鏃犳硶杩涜寮�閿�");
+ }
+ if (StringUtils.isBlank(locks.getBikeCode())) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠鎵爜閿佸ご鏃犺溅杈嗕俊鎭紝鏃犳硶杩涜寮�閿�");
+ }
MemberRides memberRides = new MemberRides();
- memberRides.setIsdeleted(Constants.ZERO);
- memberRides.setMemberId(memberId);
- memberRides.setCreateDate(new Date());
- memberRides.setRentSiteId(locks.getSiteId());
- memberRides.setRentLockId(locks.getId());
- memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
- memberRidesMapper.insert(memberRides);
-
+ //鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
+ isValidePricingType(locks,memberRides) ;
+ MqttLog flag = deviceService.openLock(locks);
MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
- BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
- return memberRidesDetailResponse;
+ if (flag.getResult() == 0) {
+ //瀛樺偍楠戣璁板綍
+ memberRides.setId(Constants.getUUID());
+ memberRides.setIsdeleted(Constants.ZERO);
+ memberRides.setMemberId(memberId);
+ memberRides.setCreateDate(new Date());
+ memberRides.setRentSiteId(locks.getSiteId());
+ memberRides.setRentLockId(locks.getCode());
+ memberRides.setOrdreId(goodsorder.getId());
+ memberRides.setRentDate(new Date());
+ memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
+ memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
+ memberRides.setCloseStatus(Constants.ZERO);
+ memberRidesMapper.insert(memberRides);
+ BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
+ }
+ return memberRidesDetailResponse;
+ }
+
+ private boolean isValidePricingType(Locks locks,MemberRides memberRides ) {
+ Bikes bike= new Bikes();
+ bike.setLockId(locks.getCode());
+ bike.setSiteId(locks.getSiteId());
+ //鏌ヨ杞﹁締淇℃伅
+ bike = bikesMapper.selectOne(new QueryWrapper<>(bike).last("limit 1"));
+ if(bike == null && StringUtils.isBlank(bike.getParamId())){
+ //濡傛灉杞﹁締绫诲瀷鏄┖
+ 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);
+ param.lambda().le(PricingParam::getStartDate,date);
+ param.lambda().ge(PricingParam::getEndDate,date);
+ param.lambda().last(" limit 1" ) ;
+ param.lambda().orderByAsc(PricingParam::getSortnum);
+ //鏌ヨ浼樺厛绾ф渶楂橈紙鎺掑簭鐮佹渶灏忕殑锛夊彲鐢ㄩ厤浠锋柟妗�
+ PricingParam pp = pricingParamMapper.selectOne(param);
+ if(pp == null){
+ //濡傛灉杞﹁締鏈缃厤浠锋柟妗堬紝鎻愮ず寮�閿佸け璐ワ紒
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曞摝锛�");
+ }
+ QueryWrapper<PricingDetail> detail = new QueryWrapper<>();
+ detail.lambda().eq(PricingDetail::getBikeTypeId,bike.getParamId());
+ detail.lambda().eq(PricingDetail::getPricePramId,pp.getId());
+ detail.lambda().eq(PricingDetail::getIsdeleted,Constants.ZERO);
+ detail.lambda().last(" limit 1" ) ;
+ //鏌ヨ浼樺厛绾ф渶楂橈紙鎺掑簭鐮佹渶灏忕殑锛夊彲鐢ㄩ厤浠锋柟妗�
+ PricingDetail pricingDetail = pricingDetailMapper.selectOne(detail);
+ if(pricingDetail == null){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曞摝~");
+ }
+ String nowDate = DateUtil.getDateLong(date);
+ Holidays holidays = new Holidays();
+ holidays.setHoliday(nowDate);
+ holidays.setIsdeleted(Constants.ZERO);
+ memberRides.setBikeCode(bike.getCode());
+ memberRides.setParamId(bike.getParamId());
+ bike.setLastRentDate(new Date());
+ bike.setStatus(Constants.ONE);
+ bikesMapper.updateById(bike);
+ //妫�鏌ユ槸鍚﹁妭鍋囨棩
+ if(holidaysMapper.selectCount(new QueryWrapper<>(holidays)) >0){
+ //濡傛灉鏄妭鍋囨棩
+ memberRides.setBasePrice(pricingDetail.getHolidayBasePrice());
+ memberRides.setBaseTime(pricingDetail.getHolidayBaseTime());
+ memberRides.setUnitPrice(pricingDetail.getHolidayUnitPrice());
+ memberRides.setUnitTime(pricingDetail.getHolidayUnitTime());
+ memberRides.setIsHoliday(Constants.ONE);
+ }else{
+ //濡傛灉鏄伐浣滄棩
+ memberRides.setBasePrice(pricingDetail.getBasePrice());
+ memberRides.setBaseTime(pricingDetail.getBaseTime());
+ memberRides.setUnitPrice(pricingDetail.getUnitPrice());
+ memberRides.setUnitTime(pricingDetail.getUnitTime());
+ memberRides.setIsHoliday(Constants.ZERO);
+ }
+ return true;
}
@Override
@@ -403,7 +537,6 @@
MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
return memberRidesDetailResponse;
-
}
/**
@@ -412,44 +545,61 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public int mqttLockInfoEvent(Locks locks){
+ if(StringUtils.isBlank(locks.getCode()) ||StringUtils.isBlank(locks.getSiteId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閿佸ご淇℃伅涓婃姤鍙傛暟閿欒锛�");
+ }
//鍒ゆ柇妫�鏌ュ鐞嗙珯鐐归攣澶翠俊鎭�
Locks model = dealLockAndSite(locks);
//杞﹁締璁板綍
Bikes bikes = dealBikesByParam(model);
-
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
if(model.getStatus() == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
MemberRides memberRides = new MemberRides();
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
- memberRides.setRentLockId(model.getId());
+ memberRides.setRentLockId(model.getCode());
+ memberRides.setRentSiteId(model.getSiteId());
memberRides.setIsdeleted(Constants.ZERO);
memberRides = findOne(memberRides);
if(memberRides == null){
return 0;
}
-
+ MemberRides update = new MemberRides();
+ update.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
+ update.setEditDate(new Date());
+ update.setId(memberRides.getId());
//锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
- memberRidesMapper.updateById( memberRides);
+ memberRidesMapper.updateById( update);
}
return 0;
}
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.getId());
+ wrapper.lambda().eq(Bikes::getLockId, model.getCode());
wrapper.lambda().eq(Bikes::getSiteId, model.getSiteId());
- Bikes bikes = bikesMapper.selectOne(wrapper.last("last 1"));
+ 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{
bikes = new Bikes();
@@ -457,7 +607,7 @@
bikes.setIsdeleted(Constants.ZERO);
bikes.setCreateDate(new Date());
bikes.setSiteId(model.getSiteId());
- bikes.setLockId(model.getId());
+ bikes.setLockId(model.getCode());
bikes.setCode(model.getBikeCode());
bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
bikesMapper.insert(bikes);
@@ -466,13 +616,35 @@
}
- //TODO-----JP------------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
+ /**
+ -----------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
+ *
+ */
private String getBileTypeByCode(String bikeCode) {
- return null;
+// int temp=1+(int)(Math.random()*(8));
+ if(StringUtils.isBlank(bikeCode)){
+ return null;
+ }
+ String type = bikeCode.substring(0,1);
+ if(!Constants.BIKE_TYPE.contains(type)){
+ return null;
+ }
+ BaseParam param = new BaseParam();
+ param.setIsdeleted(Constants.ZERO);
+ param.setType(Constants.THREE);
+ param.setSortnum(Integer.parseInt(type));
+ param = baseParamMapper.selectOne(new QueryWrapper<>(param).lambda().last("limit 1" ));
+ if(param == null){
+ return type;
+ }
+ return param.getId();
}
private Locks dealLockAndSite(Locks locks) {
- Locks model = locksMapper.selectById(locks.getId());
+ Locks model = new Locks();
+ model.setSiteId(locks.getSiteId());
+ model.setCode(locks.getCode());
+ model = locksMapper.selectOne(new QueryWrapper<>(model).last("limit 1"));
Date date =new Date();
//妫�鏌ョ珯鐐逛俊鎭紝涓嶅瓨鍦ㄥ垯鏂板
Sites sites = sitesMapper.selectById(locks.getSiteId());
@@ -483,15 +655,15 @@
sites.setId(locks.getSiteId());
sites.setCreateDate(date);
sites.setStatus(Constants.ZERO);
+ sites.setEditDate(date);
sites.setLockNum(1);
//鏂板閿佸ご
sitesMapper.insert(sites);
}
-
if(model == null){
//濡傛灉閿佸ご涓嶅瓨鍦紝鍒ゆ柇瀛樺偍
model = new Locks();
- model.setId(locks.getId());
+ model.setId(Constants.getUUID());
model.setSiteId(locks.getSiteId());
model.setIsdeleted(Constants.ZERO);
model.setCode(locks.getCode());
@@ -501,23 +673,78 @@
model.setStatus(locks.getStatus());
locksMapper.insert(model);
}else{
- model.setSiteId(locks.getSiteId());
- model.setIsdeleted(Constants.ZERO);
- model.setCode(locks.getCode());
- model.setId(locks.getSiteId());
- model.setEditDate(date);
- model.setBikeCode(locks.getBikeCode());
- model.setStatus(locks.getStatus());
- locksMapper.update(null, new QueryWrapper<>(model));
-
+ UpdateWrapper<Locks> updateWrapper = new UpdateWrapper<Locks>();
+ updateWrapper.lambda().eq(Locks::getCode, locks.getCode() );
+ updateWrapper.lambda().eq(Locks::getSiteId, locks.getSiteId() );
+ updateWrapper.lambda().set(Locks::getBikeCode, locks.getBikeCode() );
+ 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);
return model;
}
+ /**
+ * 杩樿溅璁㈤槄娑堟伅涓氬姟澶勭悊
+ * @param bikes
+ * @return
+ */
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public int mqttCloseBikeEvent(MemberRides bikes){
+ //鍏嶈垂楠戣鏃堕暱鏌ヨ锛屾暟鎹瓧鍏搁厤缃�
+ if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getBackLockId())||StringUtils.isBlank(bikes.getBackSiteId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杩樿溅涓婃姤鍙傛暟閿欒锛�");
+ }
+ QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(MemberRides::getBikeCode, bikes.getBikeCode());
+ wrapper.lambda().eq(MemberRides::getStatus, Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
+ wrapper.lambda().eq(MemberRides::getIsdeleted, Constants.ZERO);
+ //鏍规嵁杞﹁締缂栫爜鏌ヨ楠戣涓殑楠戣璁板綍淇℃伅锛屽鏋滄湁杩涜杩樿溅鎿嶄綔
+ MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("limit 1"));
+ if(memberRides!=null){
+ //杩涜
+ dealMemberRidesBack(memberRides,bikes);
+ }
return 0;
+ }
+ private void dealMemberRidesBack(MemberRides memberRides,MemberRides param) {
+ int freeTime = 0;
+ try {
+ freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
+ }catch (Exception e){
+ }
+ Date date = new Date();
+ MemberRides update = new MemberRides();
+ update.setEditDate(date);
+ update.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());
+ update.setBackDate(date);
+ update.setBackLockId(param.getBackLockId());
+ update.setBackSiteId(param.getBackSiteId());
+ update.setBackCommondId(param.getBackCommondId());
+ int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
+ 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.selectOne(new QueryWrapper<>(bikes).last("limit 1"));
+ if(bikes != null ) {
+ UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
+ updateWrapper.lambda().set(Bikes::getEditDate,new Date());
+ updateWrapper.lambda().set(Bikes::getLastBackDate,new Date());
+ //鏇存柊鑷杞︽渶鍚庤繕杞︽椂闂�
+ bikesMapper.update(null,updateWrapper);
+ }
+ //鏇存柊杩樿溅璁板綍涓哄凡杩樿溅
+ memberRidesMapper.updateById(update);
}
}
--
Gitblit v1.9.3