From 43a53e5a46ba45a6d35e3913fdfdd6f82a84a038 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 28 二月 2025 12:59:32 +0800 Subject: [PATCH] jtt808初始化 --- server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 314 insertions(+), 22 deletions(-) diff --git a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java index 81510a2..d4efb88 100644 --- a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java +++ b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java @@ -8,26 +8,36 @@ import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.Constants; import com.doumee.core.constants.ResponseStatus; +import com.doumee.core.dingding.DingDingNotice; import com.doumee.core.exception.BusinessException; import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.PositionUtil; import com.doumee.core.utils.StringTools; +import com.doumee.core.wx.SendWxMessage; +import com.doumee.core.wx.WxMiniConfig; import com.doumee.core.wx.WxMiniUtilService; import com.doumee.dao.business.*; +import com.doumee.dao.business.join.BikesJoinMapper; import com.doumee.dao.business.join.GoodsorderJoinMapper; import com.doumee.dao.business.join.MemberRidesJoinMapper; import com.doumee.dao.business.join.RefundJoinMapper; import com.doumee.dao.business.model.*; import com.doumee.dao.business.web.request.BackElecBikeRequest; import com.doumee.dao.business.web.request.LocaltionDTO; +import com.doumee.dao.business.web.request.OpenElecBikeRequest; +import com.doumee.dao.business.web.response.MemberRidesDetailResponse; import com.doumee.jtt808.web.endpoint.MessageManager; import com.doumee.service.business.GoodsorderService; import com.doumee.service.business.PricingRuleService; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import me.chanjar.weixin.common.error.WxErrorException; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ConcurrentReferenceHashMap; import org.springframework.web.bind.annotation.RequestBody; import org.yzh.commons.model.APIResult; import org.yzh.protocol.commons.transform.AttributeKey; @@ -42,24 +52,22 @@ import java.util.Date; import java.util.List; import java.util.Objects; +import java.util.concurrent.ConcurrentMap; @Service public class Jtt808Service { + @Value("${tencent.map.remoteHost}") + private String mapHost; + @Value("${tencent.map.appKey}") + private String mapKey; @Autowired private MessageManager messageManager; @Autowired private GoodsorderService goodsorderService; @Autowired private BikesMapper bikesMapper; - @Autowired - private DiscountMemberMapper discountMemberMapper; - - @Autowired - private DiscountLogMapper discountLogMapper; - - @Autowired - GoodsorderJoinMapper goodsorderJoinMapper; + private BikesJoinMapper bikesJoinMapper; @Autowired private SystemDictDataBiz systemDictDataBiz; @@ -67,26 +75,23 @@ @Autowired private MemberMapper memberMapper; @Autowired - private BaseParamMapper baseParamMapper; - @Autowired - private RefundMapper refundMapper; - - @Autowired - private RefundJoinMapper refundJoinMapper; - @Autowired private SitesMapper sitesMapper; @Autowired private MemberRidesJoinMapper memberRidesJoinMapper; @Autowired - private AdMapper adMapper; + private PricingParamMapper pricingParamMapper; @Autowired - private TransactionsMapper transactionsMapper; + private PricingDetailMapper pricingDetailMapper; @Autowired - private WxMiniUtilService wxMiniUtilService; + private HolidaysMapper holidaysMapper; + + @Autowired + private SendWxMessage sendWxMessage; + @Autowired PricingRuleService pricingRuleService; @@ -96,6 +101,10 @@ return data; } + /** + * 鎵嬪姩杩樿溅 + * @param param + */ @Transactional(rollbackFor = {BusinessException.class}) public void backElecBike(BackElecBikeRequest param) { Member member = memberMapper.selectById(param.getMemberId()); @@ -105,7 +114,24 @@ Goodsorder gparam = new Goodsorder(); gparam.setMemberId(param.getMemberId()); gparam.setStatus(Constants.goodsorderStatus.pay); + gparam.setType(Constants.ZERO); Goodsorder goodsorder = goodsorderService.findOne(gparam); + this.backBike(goodsorder); + } + + /** + * 鑷姩杩樿溅 + * @param id + */ + @Transactional + public void forceBack(String id){ + Goodsorder goodsorder = goodsorderService.findById(id); + this.backBike(goodsorder); + } + + + @Transactional(rollbackFor = {BusinessException.class}) + public void backBike(Goodsorder goodsorder){ if(Objects.isNull(goodsorder)){ throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"鏃犻獞琛岃鍗曡褰�"); } @@ -129,7 +155,12 @@ backIds.add(rides.getId()); rides.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());//宸茶繕杞� rides.setBackSiteId(bike.getSiteId());//杩樿溅绔欑偣 + rides.setBackDate(new Date()); + Integer freeRentTime = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode()); + Integer rideTime = DateUtil.betweenMin(rides.getRentDate(), rides.getBackDate()); + //璁$畻楠戣璁¤垂鏃堕暱 + rides.setDuration( rideTime > freeRentTime ? rideTime : 0 ); rides.setEditDate(rides.getBackDate()); memberRidesJoinMapper.updateById(rides);//鏇存柊楠戣鐘舵�佷负宸茶繕杞� } @@ -177,12 +208,12 @@ private void lockBikes(String clientId,int type) { T8500 request = new T8500(); request.setType(type);//鍏抽攣 - request.setClientId(StringTools.leftPad(clientId,12,'0')); + request.setClientId(StringTools.leftTrip(clientId,'0')); Mono<APIResult<T0201_0500>> result = messageManager.requestR(request, T0201_0500.class); APIResult<T0201_0500> data = result.block(); if(!data.isSuccess()){ //濡傛灉寮�閿佸け璐ワ紝鍒欒繑鍥炲紓甯� - throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝"+(type ==0?"杞﹁締寮�閿�":"杞﹁締鍏抽攣")+"澶辫触锛岃绋嶅悗閲嶈瘯锛屾垨鑰呰仈绯诲洯鍖虹鐞嗕汉鍛橈紒"); + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝"+(type ==0?"杞﹁締鍏抽攣":"杞﹁締寮�閿�")+"澶辫触锛岃绋嶅悗閲嶈瘯锛屾垨鑰呰仈绯诲洯鍖虹鐞嗕汉鍛橈紒"); } } @@ -206,7 +237,7 @@ if(array == null || array.size() ==0){ continue; } - if(PositionUtil.isInPolygon(lat,lng,array)){ + if(PositionUtil.isInPolygon(lng,lat,array)){ //濡傛灉鍦ㄥ仠杞︾偣鑼冨洿鍐咃紱 site = sites; break; @@ -231,6 +262,7 @@ Goodsorder gparam = new Goodsorder(); gparam.setMemberId(param.getMemberId()); gparam.setStatus(Constants.goodsorderStatus.pay); + gparam.setType(Constants.ZERO); Goodsorder goodsorder = goodsorderService.findOne(gparam); if(Objects.isNull(goodsorder)){ throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鎮ㄥ綋鍓嶆湁楠戣涓鍗曡褰�"); @@ -252,6 +284,7 @@ memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey()); memberRidesJoinMapper.updateById(memberRides);//鏇存柊楠戣鐘舵�佷负涓村仠涓� } + private void checkPausePostionBiz(Bikes bike) { int ruleType = 0; @@ -282,8 +315,12 @@ } } - public void updateBikesInfo(List<T0200> list) { + public void updateBikesInfo(List<T0200> list) throws Exception{ Date date = new Date(); + BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LOW_VOLTAGE).getCode()); + String ddToken = systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_TOKEN).getCode(); + String ddRobotCode = systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_ROBOTCODE).getCode(); + String ddChatToken = systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_CHATTOKEN).getCode(); for(T0200 m : list){ Bikes bike = new Bikes(); bike.setDeviceSn(m.getClientId()); @@ -293,6 +330,7 @@ if(m.getLongitude()!=0){ bike.setLongitude(new BigDecimal(m.getLongitude()).divide(new BigDecimal(1000000),8,BigDecimal.ROUND_HALF_UP)); } + updateMapLocation(bike); bike.setHeartDate(DateUtil.getDateFromLocalDateTime(m.getDeviceTime())); if(m.getAttributes()!=null ){ Battery battery= (Battery) m.getAttributes().get(AttributeKey.Battery); @@ -324,6 +362,260 @@ .set(Bikes::getSiteId,site ==null?null:site.getId()) .set( Bikes::getHeartDate,date) .eq(Bikes::getId,bikes.getId())); + + if(bikes.getVoltage().compareTo(lowVoltage)>=Constants.ZERO + && bike.getVoltage().compareTo(lowVoltage)<Constants.ZERO){ + //鍙戦�侀拤閽夐�氱煡 + DingDingNotice.lowVoltageNotice(bikes.getCode(), + PositionUtil.getTxMapAddrByLatAndLng(Double.valueOf(bike.getLatitude().toString()),Double.valueOf(bike.getLongitude().toString()),mapHost,mapKey) + ,Objects.nonNull(site)?site.getName():null, + ddToken, + ddRobotCode, + ddChatToken); + } } } + + private void updateMapLocation(Bikes bike) { + if(bike.getLatitude() == null || bike.getLongitude() == null){ + return; + } + PositionUtil.AMap aMap =PositionUtil.transform(bike.getLongitude().doubleValue() ,bike.getLatitude().doubleValue()); + bike.setLatitude(new BigDecimal(aMap.getLatitude())); + bike.setLongitude(new BigDecimal(aMap.getLongitude())); + } + + public ConcurrentMap<String,Integer> cacheOpenLock = new ConcurrentReferenceHashMap<>(); + + + @Transactional(rollbackFor = {BusinessException.class}) + public MemberRidesDetailResponse openLock(OpenElecBikeRequest openElecBikeRequest){ + Member member = memberMapper.selectById(openElecBikeRequest.getMemberId()); + if (member == null) { + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿淇℃伅鏌ヨ澶辫触锛岃杩斿洖閲嶆柊杩涘叆灏忕▼搴忓啀璇曪紒"); + } + if(Constants.formatIntegerNum(cacheOpenLock.get(openElecBikeRequest.getCode())) == 1){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ溅杈嗗凡琚攣瀹氬�熺敤锛岃灏濊瘯鏇存崲鍏朵粬杞﹁締锛�"); + } + Bikes bike = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,openElecBikeRequest.getCode()).eq(Bikes::getIsdeleted,Constants.ZERO) + .eq(Bikes::getType,Constants.ONE).last(" limit 1 ")); + if(bike == null && StringUtils.isBlank(bike.getParamId())){ + //濡傛灉杞﹁締绫诲瀷鏄┖ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曪紒"); + } + cacheOpenLock.put(openElecBikeRequest.getCode(), 1); + try { + //鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲� + Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>() + .eq("isdeleted", Constants.ZERO) + .eq("status", Constants.goodsorderStatus.pay) + .eq("type", Constants.ZERO) + .eq("member_id", member.getId()) + .orderByDesc("create_date") + .last("limit 1")); + 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 (memberRidesJoinMapper.selectCount(new QueryWrapper<MemberRides>().lambda().eq(MemberRides::getOrdreId,goodsorder.getId())) > Constants.ZERO) { + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "宸查獞琛屽叾浠栬溅杈嗭紝鏃犳硶鎵爜锛岃缁撶畻鍚庨噸鏂板皾璇�"); + } + //鍒ゆ柇鏄惁澶勪簬钀ヤ笟鏃堕棿 + goodsorderService.checkBusiness(); + //鏌ヨ鏄惁澶勪簬楠戣涓� + if (memberRidesJoinMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", member.getId()).in("status", 0, 1, 4)) > Constants.ZERO) { + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜"); + } + MemberRides memberRides = new MemberRides(); + //鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规 + isValidePricingType(bike,memberRides) ; + MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse(); + this.lockBikes(bike.getDeviceSn(),1); + //瀛樺偍楠戣璁板綍 + memberRides.setId(Constants.getUUID()); + memberRides.setIsdeleted(Constants.ZERO); + memberRides.setMemberId(member.getId()); + memberRides.setCreateDate(new Date()); + memberRides.setOrdreId(goodsorder.getId()); + memberRides.setBikeCode(bike.getCode()); + memberRides.setRentDate(new Date()); + memberRides.setType(Constants.ONE); + memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode())); + memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey()); + memberRides.setCloseStatus(Constants.ZERO); + memberRidesJoinMapper.insert(memberRides); + BeanUtils.copyProperties(memberRides, memberRidesDetailResponse); + return memberRidesDetailResponse; + }catch (BusinessException biz){ + throw biz; + }catch (Exception biz){ + throw new BusinessException(ResponseStatus.SERVER_ERROR); + }finally { + cacheOpenLock.remove(openElecBikeRequest.getCode()); + } + } + + + @Transactional(rollbackFor = {BusinessException.class}) + public void pauseOpenElecBike(BackElecBikeRequest param) { + Member member = memberMapper.selectById(param.getMemberId()); + if (member == null) { + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿淇℃伅鏌ヨ澶辫触锛岃杩斿洖閲嶆柊杩涘叆灏忕▼搴忓啀璇曪紒"); + } + Goodsorder gparam = new Goodsorder(); + gparam.setMemberId(param.getMemberId()); + gparam.setStatus(Constants.goodsorderStatus.pay); + gparam.setType(Constants.ZERO); + Goodsorder goodsorder = goodsorderService.findOne(gparam); + if(Objects.isNull(goodsorder)){ + throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鎮ㄥ綋鍓嶆湁楠戣涓鍗曡褰�"); + } + //鏌ヨ褰撳墠姝e湪涓村仠涓殑楠戣璁板綍 + MemberRides memberRides = memberRidesJoinMapper.selectJoinOne(MemberRides.class,new MPJLambdaWrapper<MemberRides>() + .eq(MemberRides::getOrdreId,goodsorder.getId()) + .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey()) + .selectAll(MemberRides.class) + .last("limit 1")); + if(memberRides ==null || memberRides.getBikeCode() == null){ + throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鎮ㄥ綋鍓嶆湁涓村仠涓褰�"); + } + Bikes bike = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,memberRides.getBikeCode()) + .eq(Bikes::getIsdeleted,Constants.ZERO) + .eq(Bikes::getType,Constants.ONE) + .last(" limit 1 ") + ); + if(bike == null && StringUtils.isBlank(bike.getParamId())){ + //濡傛灉杞﹁締绫诲瀷鏄┖ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "杞﹀瀷淇℃伅寮傚父锛岃鑱旂郴绠$悊鍛�"); + } + this.lockBikes(bike.getDeviceSn(),1); + //鏇存柊楠戣鐘舵�佷负楠戣涓� + memberRides.setEditDate(memberRides.getBackDate()); + memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey()); + memberRidesJoinMapper.updateById(memberRides); + } + + + private boolean isValidePricingType(Bikes bike,MemberRides memberRides ) { + //鏌ヨ杞﹀瓙鐢甸噺淇℃伅 + if(goodsorderService.getVoltageStatus(bike)>0){ + 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; + } + + + /** + * 涓存椂鍋滆溅瓒呮椂 鑷姩杩樿溅 + */ + public void autoBackBike() throws WxErrorException { + List<MemberRides> memberRidesList = memberRidesJoinMapper.selectJoinList(MemberRides.class,new MPJLambdaWrapper<MemberRides>() + .selectAll(MemberRides.class) + .leftJoin(Goodsorder.class,Goodsorder::getId,MemberRides::getOrdreId) + .eq(Goodsorder::getStatus,Constants.ONE) + .eq(MemberRides::getIsdeleted,Constants.ZERO) + .eq(MemberRides::getType,Constants.ONE) + .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey()) + .apply(" NOW() >= (t.create_date + INTERVAL '"+systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PAUSE_AUTO_CLOSE_TIME).getCode()+" min') ") + ); + + ; + for (MemberRides timeOutRides:memberRidesList) { + Goodsorder goodsorder = goodsorderService.findById(timeOutRides.getOrdreId()); + //鏌ヨ楠戣璁板綍 + List<MemberRides> memberRides = goodsorderService.getMemberRidesForClose(goodsorder.getId()); + if(memberRides!=null && memberRides.size()>0){ + for (MemberRides rides : memberRides){ + if(Constants.equalsInteger(rides.getStatus(),Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey()) + &&Constants.equalsInteger(rides.getType(),Constants.ONE)){ + //濡傛灉鏄數杞﹀苟涓旀槸楠戣涓� 杩涜鍏抽攣澶勭悊 + Bikes bike = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda() + .eq(Bikes::getType,Constants.ONE) + .eq(Bikes::getIsdeleted,Constants.ZERO) + .eq(Bikes::getCode,rides.getBikeCode()) + ); + lockBikes(bike.getDeviceSn(),Constants.ZERO);//鍙戣捣鍏抽攣鎸囦护璇锋眰 + rides.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());//宸茶繕杞� + rides.setBackSiteId(bike.getSiteId());//杩樿溅绔欑偣 + rides.setBackDate(new Date()); + Integer freeRentTime = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode()); + Integer rideTime = DateUtil.betweenMin(rides.getRentDate(), rides.getBackDate()); + //璁$畻楠戣璁¤垂鏃堕暱 + rides.setDuration( rideTime > freeRentTime ? rideTime : 0 ); + rides.setEditDate(rides.getBackDate()); + memberRidesJoinMapper.updateById(rides);//鏇存柊楠戣鐘舵�佷负宸茶繕杞� + } + } + } + //璁㈠崟缁撶畻 + Date date = new Date(); + goodsorder.setEditDate(date); + goodsorder.setEditor(null); + goodsorderService.dealCloseGoodsorderBiz( goodsorder,Constants.REFUND_TYPE.NORMAL.getKey(),memberRides); + //鍙戦�佸皬绋嬪簭閫氱煡 + Member member = memberMapper.selectById(goodsorder.getMemberId()); + if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){ + sendWxMessage.bookingsCancel(member.getOpenid(),goodsorder.getId(), + WxMiniConfig.wxMaService.getAccessToken(), + timeOutRides.getBikeCode(),goodsorder.getPayDate(),goodsorder.getEditDate()); + } + } + } + + + + } -- Gitblit v1.9.3