From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java |  665 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 581 insertions(+), 84 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 4d3dffc..c1ab843 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,9 +1,12 @@
 package com.doumee.service.business.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.model.LoginUserInfo;
@@ -11,42 +14,38 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.GoodsorderMapper;
-import com.doumee.dao.business.LocksMapper;
 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.*;
-import com.doumee.dao.business.model.BaseParam;
-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.model.*;
 import com.doumee.dao.business.web.request.MemberRidesQuery;
 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.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.service.system.SystemDictDataService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.checkerframework.checker.units.qual.C;
 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 org.springframework.util.ConcurrentReferenceHashMap;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Collectors;
 
 /**
  * 鐢ㄦ埛楠戣璁板綍琛⊿ervice瀹炵幇
@@ -59,6 +58,12 @@
     @Autowired
     private MemberRidesMapper memberRidesMapper;
     @Autowired
+    private HolidaysMapper holidaysMapper;
+    @Autowired
+    private PricingParamMapper pricingParamMapper;
+    @Autowired
+    private PricingDetailMapper pricingDetailMapper;
+    @Autowired
     private ActionLogMapper actionLogMapper;
 
     @Autowired
@@ -69,9 +74,22 @@
 
     @Autowired
     private LocksMapper locksMapper;
+    @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) {
@@ -121,7 +139,7 @@
     @Override
     public MemberRides findOne(MemberRides memberRides) {
         QueryWrapper<MemberRides> wrapper = new QueryWrapper<>(memberRides);
-        return memberRidesMapper.selectOne(wrapper);
+        return memberRidesMapper.selectOne(wrapper.last(" limit 1"));
     }
 
     @Override
@@ -161,10 +179,12 @@
     public MemberRides findJoinById(String id) {
 
         MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
-        queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId);
-        queryWrapper.eq(MemberRides::getMemberId, id);
+        queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
+                    .leftJoin(Member.class,Member::getId,MemberRides::getMemberId);
+        queryWrapper.eq(MemberRides::getId, id);
         queryWrapper.selectAll(MemberRides.class);
-        queryWrapper.selectAs(BaseParam::getName,MemberRidesDTO::getBikeType) ;
+        queryWrapper.selectAs(BaseParam::getName,MemberRidesDTO::getBikeType);
+        queryWrapper.selectAs(Member::getOpenid,MemberRides::getMemberOpenid);
         queryWrapper.last("limit 1");
 
         return memberRidesJoinMapper.selectJoinOne(MemberRides.class, queryWrapper);
@@ -173,42 +193,74 @@
     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);
-        if (!CollectionUtils.isEmpty(bikeLogDTOIPage.getRecords())){
-            bikeLogDTOIPage.getRecords().forEach(s->{
+        initBikeLogObj(bikeLogDTOIPage.getRecords());
+        return PageData.from(bikeLogDTOIPage);
+    }
+    public static List<BikeLogDTO> findBikeLogList( MemberRidesJoinMapper mrJoinMapper,MemberRidesQuery pageWrap) {
+        MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap);
+        List<BikeLogDTO> list = mrJoinMapper.selectJoinList( BikeLogDTO.class, queryWrapper);
+        initBikeLogObj(list);
+        return list;
+    }
+
+    public static void initBikeLogObj(List<BikeLogDTO> list){
+        if (!CollectionUtils.isEmpty(list)){
+            list.forEach(s->{
                 if (Objects.nonNull(s.getBackDate())){
                     s.setRideTime(DateUtil.betweenMin(s.getRentDate(),s.getBackDate()));
                 }
             });
         }
-        return PageData.from(bikeLogDTOIPage);
     }
-
-    private MPJLambdaWrapper<MemberRides> initQueryParamByModel(MemberRidesQuery model) {
+    public  static MPJLambdaWrapper<MemberRides> initQueryParamByModel(MemberRidesQuery model) {
         MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(model);
         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(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());
+        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.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
+        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)
                 .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)
@@ -218,7 +270,7 @@
         if(Objects.isNull(memberRides)){
             return null;
         }
-        return memberRides.getBikeCode();
+        return memberRides;
     }
 
     /**
@@ -228,7 +280,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);
@@ -238,7 +290,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())){
@@ -264,17 +316,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());
         //璁板綍鎿嶄綔鏃ュ織
@@ -289,10 +341,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());
@@ -302,6 +353,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()
+                .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));
+
         MemberRides update = new MemberRides();
         update.setId(model.getId());
         update.setEditDate(new Date());
@@ -311,29 +368,49 @@
         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(Constants.formatIntegerFromStr(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);
         //淇敼鍚�
         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());
         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());
@@ -343,48 +420,161 @@
 
     }
 
+    public ConcurrentMap<String,Integer> cacheOpenLock = new ConcurrentReferenceHashMap<>();
 
     @Override
-    public MemberRidesDetailResponse openLock(String code,String memberId){
-        //鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲�
-        Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
-                .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(),"鏈敮浠樻娂閲戯紝鏃犳硶杩涜璇ユ搷浣滐紒");
+    public MemberRidesDetailResponse openLock(String code,String memberId) {
+        if(Constants.formatIntegerNum(cacheOpenLock.get(code)) == 1){
+            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"));
-        Boolean flag = deviceService.openLock(locks);
-        if(!flag){
-            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);
+        cacheOpenLock.put(code, 1);
+        try {
+            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)
+                    .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(), "闈炰粖鏃ユ娂閲戣鍗曪紝璇风粨绠楀悗閲嶆柊鏀粯锛�");
+            }
+            //鍒ゆ柇鏄惁澶勪簬钀ヤ笟鏃堕棿
+            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(), "瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜");
+            }
+            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)) {
+//            locks =new Locks();
+//            locks.setCode(codes[1]);
+//            locks.setSiteId(codes[0]);
+//            deviceService.getLockInfo(locks);
+                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛岃绔欑偣閿佸ご鏆備笉鏀寔鍊熷嚭涓氬姟鍝︼紒");
+            }
+            //鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝e父
+            if (Constants.formatIntegerNum(locks.getStatus())!=Constants.ZERO) {
+                locks =new Locks();
+                locks.setCode(Constants.formatIntegerFromStr(codes[1]));
+                locks.setSiteId(codes[0]);
+                deviceService.getLockInfo(locks);
+                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈唦");
+            }
+            if (StringUtils.isBlank(locks.getBikeCode())) {
+                locks =new Locks();
+                locks.setCode(Constants.formatIntegerFromStr(codes[1]));
+                locks.setSiteId(codes[0]);
+                deviceService.getLockInfo(locks);
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈嗭紒");
+            }
+            MemberRides memberRides = new MemberRides();
+            //鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
+            isValidePricingType(locks,memberRides) ;
+            MqttLog flag = deviceService.openLock(locks);
+            MemberRidesDetailResponse memberRidesDetailResponse = new 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);
 
-        MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
-        BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
-        return memberRidesDetailResponse;
+                memberRidesMapper.insert(memberRides);
+                BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
+            }else{
+                throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈唦");
+            }
+            return memberRidesDetailResponse;
+        }catch (BusinessException biz){
+            throw  biz;
+        }catch (Exception biz){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR);
+        }finally {
+            cacheOpenLock.remove(code);
+        }
 
+    }
+
+    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
@@ -396,6 +586,313 @@
         MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
         BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
         return memberRidesDetailResponse;
+    }
 
+    /**
+     * 閿佸ご淇℃伅涓婃姤
+     * @param locks
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public  int mqttLockInfoEvent(Locks locks){
+        if( locks.getCode() ==null ||StringUtils.isBlank(locks.getSiteId())){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閿佸ご淇℃伅涓婃姤鍙傛暟閿欒锛�");
+        }
+        //鍒ゆ柇妫�鏌ュ鐞嗙珯鐐归攣澶翠俊鎭�
+        Locks model = dealLockAndSite(locks);
+        //杞﹁締璁板綍
+        Bikes bikes = dealBikesByParam(model);
+        //鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
+        if(Constants.formatIntegerNum(locks.getStatus()) == Constants.LockStatus.open){
+            //濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
+            MemberRides memberRides = new MemberRides();
+            memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
+            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( update);
+        }else   if(Constants.formatIntegerNum(locks.getStatus())  == Constants.LockStatus.closed ){
+            //濡傛灉鏄叧閿佷笟鍔★紝鍒ゆ柇瑙﹀彂杩樿溅
+            if(StringUtils.isNotBlank(locks.getBikeCode())){
+                MemberRides mbikes = new MemberRides();
+                mbikes.setBackLockId(locks.getCode());
+                mbikes.setBackSiteId(locks.getSiteId());
+                mbikes.setBikeCode(locks.getBikeCode());
+                mqttCloseBikeEventDo(mbikes);
+               /* if(StringUtils.isBlank(locks.getBikeCode()) ||StringUtils.isBlank(locks.getCode())
+                        ||StringUtils.isBlank(bikes.getSiteId())){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杩樿溅涓婃姤鍙傛暟閿欒锛�");
+                }
+                QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+                List<Integer> statusList = new ArrayList<>();
+                statusList.add(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
+                statusList.add(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
+                wrapper.lambda().eq(MemberRides::getBikeCode, locks.getBikeCode());
+                wrapper.lambda().in(MemberRides::getStatus, statusList);
+                wrapper.lambda().eq(MemberRides::getIsdeleted, Constants.ZERO);
+                //鏍规嵁杞﹁締缂栫爜鏌ヨ楠戣涓殑楠戣璁板綍淇℃伅锛屽鏋滄湁杩涜杩樿溅鎿嶄綔
+                List<MemberRides> list = memberRidesMapper.selectList(wrapper);
+//        MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("limit  1"));
+                if(list!=null){
+                    //杩涜
+                    for(MemberRides memberRides : list){
+                        dealMemberRidesBack(memberRides,bikes);
+                    }
+                }*/
+            }
+        }
+        return 0;
+    }
+
+
+    @Override
+    public void autoRefreshLockStatus() {
+//        memberRidesMapper.update(null,new UpdateWrapper<MemberRides>().lambda()
+//                        .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING.getKey())
+//                .apply(""  )
+//                .set(MemberRides::getStatus, Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey()))
+
+        QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+        wrapper.lambda()
+                .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING.getKey())
+                .eq(MemberRides::getIsdeleted,Constants.ZERO);
+        List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
+        if (!CollectionUtils.isEmpty(memberRides)){
+            memberRides.forEach(s->{
+                Integer between = DateUtil.betweenSeconds(s.getCreateDate(), new Date());
+                // 澶т簬闃堝��
+                if (between >= 20){
+                    s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
+                    s.setEditDate(new Date());
+                    memberRidesMapper.updateById(s);
+                }
+            });
+        }
+    }
+
+    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())){
+                //濡傛灉缁戝畾杞﹁締淇℃伅鍙戠敓缂栧彿锛屾洿鎹㈢粦瀹氬叧绯�
+                String type =getBileTypeByCode(model.getBikeCode());
+                UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
+                updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
+                updateWrapper.lambda().set(Bikes::getParamId,type);
+                //鏇存柊鑷绔欑偣閿佸ご缁戝畾鑷杞︿俊鎭�
+                bikesMapper.update(null,updateWrapper);
+                bikes.setCode(model.getBikeCode());
+                bikes.setParamId(model.getBikeType());
+            }
+        }else{
+            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());
+            bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
+            bikesMapper.insert(bikes);
+        }
+        return  bikes;
+
+    }
+
+    /**
+     -----------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
+     *
+     */
+    private String getBileTypeByCode(String bikeCode) {
+//      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 = 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());
+
+        if(sites == null){
+            sites = new Sites();
+            sites.setIsdeleted(Constants.ZERO);
+            sites.setCode(locks.getSiteId());
+            sites.setId(locks.getSiteId());
+            sites.setCreateDate(date);
+            sites.setEditDate(date);
+            sites.setStatus(Constants.ZERO);
+            sites.setEditDate(date);
+            sites.setLockNum(1);
+            sites.setLastLinkDate(date);
+            //鏂板閿佸ご
+            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();
+            model.setId(Constants.getUUID());
+            model.setSiteId(locks.getSiteId());
+            model.setIsdeleted(Constants.ZERO);
+            model.setCode(locks.getCode());
+            model.setSiteId(locks.getSiteId());
+            model.setBikeCode(locks.getBikeCode());
+            model.setCreateDate(date);
+            model.setStatus(locks.getStatus());
+            locksMapper.insert(model);
+            //鏇存柊 绔欑偣閿佸ご鏁伴噺
+            if(Objects.nonNull(sites)){
+                Sites sites1 = new Sites();
+                sites1.setId(sites.getId());
+                sites1.setLockNum(Constants.formatIntegerNum(sites.getLockNum())+1);
+                sitesMapper.updateById(sites1);
+            }
+        }else{
+            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.setStatus(locks.getStatus());
+            model.setBikeCode(locks.getBikeCode());
+        }
+        model.setSites(sites);
+        return  model;
+    }
+
+    /**
+     * 杩樿溅璁㈤槄娑堟伅涓氬姟澶勭悊
+     * @param bikes
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public  int mqttCloseBikeEvent(MemberRides bikes){
+        Locks locks  = new Locks();
+        locks.setSiteId(bikes.getBackSiteId());
+        locks.setCode(bikes.getBackLockId());
+        locks.setBikeCode(bikes.getBikeCode());
+        locks.setInfo(bikes.getBackCommondId());
+        locks.setStatus(bikes.getStatus());
+        //澶勭悊閿佸ご鏁版嵁
+         mqttLockInfoEvent(locks);
+         mqttCloseBikeEventDo(bikes);
+        return  0;
+    }
+
+    private void mqttCloseBikeEventDo(MemberRides bikes) {
+        if(StringUtils.isBlank(bikes.getBikeCode()) || bikes.getBackLockId() == null ||StringUtils.isBlank(bikes.getBackSiteId())){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杩樿溅涓婃姤鍙傛暟閿欒锛�");
+        }
+        QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+        List<Integer> statusList = new ArrayList<>();
+        statusList.add(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
+        statusList.add(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
+        wrapper.lambda().eq(MemberRides::getBikeCode, bikes.getBikeCode());
+        wrapper.lambda().in(MemberRides::getStatus, statusList);
+        wrapper.lambda().eq(MemberRides::getIsdeleted, Constants.ZERO);
+        //鏍规嵁杞﹁締缂栫爜鏌ヨ楠戣涓殑楠戣璁板綍淇℃伅锛屽鏋滄湁杩涜杩樿溅鎿嶄綔
+        List<MemberRides> list = memberRidesMapper.selectList(wrapper);
+//        MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("limit  1"));
+        if(list!=null){
+            //杩涜
+            for(MemberRides memberRides : list){
+                dealMemberRidesBack(memberRides,bikes);
+            }
+        }
+    }
+
+    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;
+        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("鐢ㄦ埛姝e父杩樿溅");
+        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