111

k94314517

2025-02-19 18cf2f252338e52fb531cd2ca1cc49e39bf6efe0

111

 server/platform/src/main/resources/application.yml

@@ -9,7 +9,7 @@
#  application:
#    name: parkbike
  profiles:
    active: pro
    active: dev
  # JSON返回配置
  jackson:
    # é»˜è®¤æ—¶åŒº

 server/services/src/main/java/com/doumee/core/constants/Constants.java

@@ -34,6 +34,7 @@

    public static final String MINI_PROGRAMME ="MINI_PROGRAMME" ;
    public static final String FREE_RENT_TIME ="FREE_RENT_TIME" ;
    public static final String LOW_VOLTAGE ="LOW_VOLTAGE" ;
    public static final String ACCESS_TOKEN ="ACCESS_TOKEN" ;
    public static final String IMG_DIR = "IMG_DIR";
    public static final String FILE_DIR ="FILE_DIR" ;
@@ -220,6 +221,8 @@
        public static final String BUSINESS_STARTTIME = "BUSINESS_STARTTIME";
        //小程序每日服务结束时间
        public static final String BUSINESS_ENDTIME = "BUSINESS_ENDTIME";
        //电车二维码前缀
        public static final String ELECTRICITY_PREFIX = "ELECTRICITY_PREFIX";

        //钉钉通知地址
        public static final String DINGDING_URL = "DINGDING_URL";

 server/services/src/main/java/com/doumee/dao/business/DiscountMemberMapper.java

@@ -2,11 +2,12 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.DiscountMember;
import com.github.yulichang.base.mapper.MPJJoinMapper;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2025/02/17 09:43
 */
public interface DiscountMemberMapper extends BaseMapper<DiscountMember> {
public interface DiscountMemberMapper extends MPJJoinMapper<DiscountMember> {

}

 server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java

@@ -146,6 +146,14 @@
    @TableField(exist = false)
    private Integer useTimes;

    @ApiModelProperty(value = "使用时长")
    @TableField(exist = false)
    private Integer useTime;

    @ApiModelProperty(value = "剩余时长",hidden = true)
    @TableField(exist = false)
    private Integer surplusTime;

    @ApiModelProperty(value = "骑行记录")
    @TableField(exist = false)
    private List<DiscountLog> discountLogList;

 server/services/src/main/java/com/doumee/dao/business/web/request/OpenElecBikeRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.doumee.dao.business.web.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/10/9 11:04
 */
@Data
@ApiModel("电车开锁请求参数")
public class OpenElecBikeRequest {

    @ApiModelProperty(value = "用户编码（关联member表）",hidden = true)
    private String memberId;

    @ApiModelProperty(value = "车辆编号")
    private String code;

}

 server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.business.model.DiscountMember;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -43,11 +44,18 @@

    @ApiModelProperty(value = "计价规则")
    private String priceRole;

    @ApiModelProperty(value = "车型")
    private String bikeType;

    @ApiModelProperty(value = "编号")
    private String bikeCode;

    @ApiModelProperty(value = "订单类型：0=自行车订单；1=电车订单")
    private Integer ridesType;

    @ApiModelProperty(value = "电量状态：0=电量充足；1=电量低")
    private Integer voltageStatus;

    @ApiModelProperty(value = "起步价", example = "1")
    private BigDecimal basePrice;
@@ -63,4 +71,8 @@

    @ApiModelProperty(value = "骑行记录主键")
    private String rideId;

    @ApiModelProperty(value = "套餐卡信息")
    private DiscountMember discountMember;

}

 server/services/src/main/java/com/doumee/dao/business/web/response/RidesDetailResponse.java

@@ -29,6 +29,13 @@
    @ApiModelProperty(value = "计费时长")
    private Integer  duration;

    @ApiModelProperty(value = "是否存在骑行卡抵扣:0=否；1=是；")
    private Integer haveDisCount;

    @ApiModelProperty(value = "抵扣金额")
    private BigDecimal disCountMoney;


    @ApiModelProperty(value = "骑行记录")
    private List<MemberRidesResponse> memberRidesResponseList;
}

 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java

@@ -151,6 +151,7 @@
     */
    GoodsorderDetailDTO getGoodsorderDetailDTO(String id);

    Integer getVoltageStatus(Bikes bikes);
    /**
     * å¥—餐卡订单详情
     * @param id
@@ -159,7 +160,6 @@
    GoodsorderDetailVO getGoodsorderDetailForDisCount(String id);
    /**
     * å¼ºåˆ¶ç»“算订单
     * @param id
     * @return
     */
    void closeGoodsorder(Goodsorder  order,int type );
@@ -169,7 +169,6 @@

    /**
     * é€€æ¬¾
     * @param orderId
     */
    void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
    List<MemberRides> getMemberRidesForClose(String orderid );

 server/services/src/main/java/com/doumee/service/business/MemberRidesService.java

@@ -9,6 +9,7 @@
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.business.web.response.MemberRidesResponse;

import java.util.List;

@@ -132,6 +133,9 @@
     * @return
     */
    MemberRidesDetailResponse refreshLock(String id);

    MemberRidesResponse getBikeChargingRule(String code, String memberId);

    void updateDuration(MemberRides memberRides);

    void forceBack(MemberRides memberRides);

 server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java

@@ -73,7 +73,7 @@
                || StringUtils.isBlank(discount.getName())
                || Objects.isNull(discount.getType())
                || Objects.isNull(discount.getLimitType())
                || (Constants.equalsInteger(discount.getLimitTime(),Constants.ONE) && Objects.isNull(discount.getLimitTime()))
                || (Constants.equalsInteger(discount.getLimitTime(),Constants.ONE) && (Objects.isNull(discount.getLimitTime()) || discount.getLimitTime() > 1440))
                || Objects.isNull(discount.getPrice()) || discount.getPrice().compareTo(BigDecimal.ZERO) <= Constants.ZERO
                || Objects.isNull(discount.getChannel())
                || Objects.isNull(discount.getStartDate())
@@ -85,17 +85,14 @@
                || (Objects.isNull(discount.getUseHoliday()) || Objects.isNull(discount.getUseWorkday()) )
                || (Objects.isNull(discount.getIsbike()) || Objects.isNull(discount.getIselecbike()) )
        ){
            throw new BusinessException(ResponseStatus.SERVER_ERROR);
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(discount.getStartDate().getTime()>discount.getEndDate().getTime()){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"销售时段信息错误");
        }
        //固定日期生效
        if(Constants.equalsInteger(discount.getUseType(),Constants.ZERO) &&
                ( discount.getUseStartDate().getTime()>discount.getUseEndDate().getTime() ||
                        discount.getUseStartDate().getTime() < discount.getStartDate().getTime() ||
                        discount.getUseEndDate().getTime() > discount.getEndDate().getTime()
                ) ){
                ( discount.getUseStartDate().getTime()>discount.getUseEndDate().getTime()) ){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"使用时段信息错误");
        }

@@ -165,6 +162,7 @@
    @Override
    public Discount findById(String id) {
        Discount discount = discountJoinMapper.selectOne(new MPJLambdaWrapper<Discount>()
                        .selectAll(Discount.class)
                .select(" (select count(1) from goodsorder g where g.obj_type = 0 and g.obj_id = t.id and g.pay_status = 1 ) ",Discount::getSaleNum)
                .leftJoin(SystemUser.class,SystemUser::getId,Discount::getCreator)
                .eq(Discount::getId,id)

 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -92,6 +92,9 @@
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private BikesMapper bikesMapper;



    @Autowired
@@ -121,6 +124,10 @@

    @Autowired
    RefundService refundService;

    @Autowired
    private HolidaysMapper holidaysMapper;


    @Override
    public String create(Goodsorder goodsorder) {
@@ -346,16 +353,11 @@
    }





    @Override
    public long count(Goodsorder goodsorder) {
        QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
        return goodsorderMapper.selectCount(wrapper);
    }



    @Override
    public HomeResponse getHome(String memberId){
@@ -373,6 +375,7 @@
        homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0);
        homeResponse.setIsBusiness(this.checkBusiness()?0:1);
        homeResponse.setUnBusinessTips("营业时间为"+ systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode() +" ~ "+systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode()+"，请在营业时间内使用本系统");

        homeResponse.setAdList(adMapper.selectList(new QueryWrapper<Ad>()
                .eq("isdeleted",Constants.ZERO)
                .eq("status",Constants.ZERO)
@@ -423,13 +426,14 @@
                        .ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())
                        .orderByDesc(MemberRides::getCreateDate)
                        .last(" limit 1  "));
                if (!Objects.isNull(memberRides)) {
                if (Objects.nonNull(memberRides)) {
                    homeResponse.setRideStatus(memberRides.getStatus());
                    MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
                    BaseParam baseParam = baseParamMapper.selectById(memberRides.getParamId());
                    if(!Objects.isNull(baseParam)){
                        memberRidesResponse.setBikeType(baseParam.getName());
                    }
                    memberRidesResponse.setRidesType(memberRides.getType());
                    memberRidesResponse.setRideId(memberRides.getId());
                    memberRidesResponse.setRideStartTime(memberRides.getRentDate());
                    memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
@@ -445,13 +449,27 @@
                            memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
                            memberRidesResponse.getUnitPrice()
                            ,memberRidesResponse.getUnitTime()));
                    if(Constants.equalsInteger(memberRides.getType(),Constants.ONE)){
                        Bikes bikes = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,memberRides.getBikeCode()).eq(Bikes::getType,Constants.ONE).last("limit 1"));
                        memberRidesResponse.setVoltageStatus(this.getVoltageStatus(bikes));
                    }
                    //查询当前的骑行套餐
                    memberRidesResponse.setDiscountMember(this.getUseDiscount(memberId,Constants.ZERO));
                    homeResponse.setMemberRidesResponse(memberRidesResponse);
                }
            }
        }


        return homeResponse;
    }

    @Override
    public Integer getVoltageStatus(Bikes bikes){
        //低电量电压
        BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.LOW_VOLTAGE).getCode());
        if(Objects.isNull(bikes)||Objects.isNull(bikes.getVoltage())||Objects.isNull(lowVoltage)){
            return 0;
        }
        return bikes.getVoltage().compareTo(lowVoltage)>0?0:1;
    }


@@ -596,7 +614,7 @@
                freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
            }catch (Exception e){
            }
            closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney()).getAmount();
            closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney(),goodsorder.getMemberId()).getAmount();
            //实际结算价格，记录在最高车型记录上
//            memberRides.get(0).setActualPrice(closeMoney);
        }
@@ -818,11 +836,13 @@
        transactionsMapper.insert(transactions);
    }

    private RidesDetailResponse    getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney) {
    private RidesDetailResponse  getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney,String memberId) {
        RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
        ridesDetailResponse.setHaveDisCount(Constants.ZERO);
        BigDecimal closeMoney = new BigDecimal(0.00);
        int durationSum = 0;
        MemberRides topRides =null;

        //取最高车型计算方案结算订单
        for(MemberRides rides : memberRides){
            if ( isClose && Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(rides.getStatus()))){
@@ -836,7 +856,8 @@
                }
            }
        }
//      MemberRides topRides =memberRides.get(0);

        //计算应付金额
        if( topRides != null){
            int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
            closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
@@ -850,6 +871,49 @@
                }
            }
            topRides.setActualPrice(closeMoney);
        } 
        //查询是否存在套餐信息
        DiscountMember discountMember = this.getUseDiscount(memberId,durationSum);
        //计算抵扣金额
        if(Objects.nonNull(discountMember) && discountMember.getSurplusTime() > Constants.ZERO && Objects.nonNull(topRides)){
            //存储抵扣记录
            DiscountLog discountLog = new DiscountLog();
            discountLog.setIsdeleted(Constants.ZERO);
            discountLog.setCreator(memberId);
            discountLog.setCreateDate(new Date());
            discountLog.setDiscountMemberId(discountMember.getId());
            discountLog.setType(Constants.ZERO);
            discountLog.setInfo("骑行抵扣");
            discountLog.setEditInfo("骑行抵扣");
            discountLog.setGoodsorderId(topRides.getOrdreId());
            //如果骑行时间小于等于剩余时间 åˆ™ç›´æŽ¥æ·»åŠ  éª‘行卡使用数据  ä¿®æ­£å®žé™…支付金额
            if(discountMember.getSurplusTime() >= durationSum){
                discountLog.setRideTime(durationSum);
                discountLog.setRidePrice(closeMoney);
                discountLogMapper.insert(discountLog);
                topRides.setActualPrice(BigDecimal.ZERO);
                closeMoney = BigDecimal.ZERO;
            }else{
                int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
                BigDecimal closeDisCountMoney = Constants.formatDecimalNum(topRides.getBasePrice());
                //如果是一口价方式，价格直接为一口价baseMoney,如果不是计算正常价格
                Integer durationDisCountSum = durationSum - discountMember.getSurplusTime();
                discountLog.setRideTime(discountMember.getSurplusTime());
                if(baseTime != -1){//不是一口价
                    if(durationDisCountSum > baseTime && Constants.formatIntegerNum(topRides.getUnitTime())>0){
                        //如果超出了起步价格，计算超出价格
                        BigDecimal unit = new BigDecimal(durationSum-baseTime).divide(new BigDecimal(topRides.getUnitTime()), 0, BigDecimal.ROUND_UP);
                        //计算金额累计超出部门价格（超出时间单位*超出单位时间价格）
                        closeDisCountMoney = closeDisCountMoney.add(unit.multiply(Constants.formatDecimalNum(topRides.getUnitPrice())));
                    }
                    discountLog.setRidePrice(closeMoney.subtract(closeDisCountMoney));
                }else{
                    discountLog.setRidePrice(BigDecimal.ZERO);
                }
            }
            discountLogMapper.insert(discountLog);
            ridesDetailResponse.setHaveDisCount(Constants.ONE);
            ridesDetailResponse.setDisCountMoney(discountLog.getRidePrice());
        }
        //如果订单价格封顶了，取订单 ä»·æ ¼
        if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
@@ -1082,7 +1146,7 @@
                return memberRidesResponse;
            }).collect(Collectors.toList());
            //累计和预算结算金额
            RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney());
            RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney(),goodsorder.getMemberId());
            if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){
                //如果非已支付但未结算，使用订单金额
                ridesDetailResponse.setAmount(goodsorder.getCloseMoney());
@@ -1494,4 +1558,75 @@
    }


    /**
     * èŽ·å–当前可使用的套餐
     * @param memberId
     */
    public DiscountMember getUseDiscount(String memberId,Integer driveTime){
        String today = DateUtil.getToday();
        //判断今天是否为节假日
        Holidays holidays = new Holidays();
        holidays.setHoliday(today);
        holidays.setIsdeleted(Constants.ZERO);
        //是否是节假日 1=是；0=否
        Integer holiday = holidaysMapper.selectCount(new QueryWrapper<>(holidays))>0?1:0;
        List<DiscountMember> discountMemberList = discountMemberMapper.selectJoinList(DiscountMember.class,new MPJLambdaWrapper<DiscountMember>()
                .selectAll(DiscountMember.class)
                .select(" select sum(d.ride_time) from discount_log d  where and d.discount_member_id = discount_member.id " +
                        "and  d.isdeleted = 0 and  d.type = 0 and   EXTRACT(DAY FROM d.create_date) = EXTRACT(DAY FROM CURRENT_DATE) " , DiscountMember::getUseTime)//查询今日已使用时间
                .eq(DiscountMember::getStatus,Constants.ZERO)
                .eq(DiscountMember::getMemberId,memberId)
                .ge(DiscountMember::getUseStartDate, Utils.Date.getStart(DateUtil.StringToDate(today)))
                .le(DiscountMember::getUseEndDate, Utils.Date.getEnd(DateUtil.StringToDate(today)))
                .eq(Constants.equalsInteger(holiday,Constants.ONE),DiscountMember::getUseHoliday,Constants.ONE)
                .orderByDesc(DiscountMember::getLimitType)
                .orderByDesc(DiscountMember::getLimitTime)
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(discountMemberList)){
            //查看是否有无期限的套餐 å¦‚果存在 åˆ™ç›´æŽ¥è¿”回无期限的套餐
            Optional<DiscountMember> optional = discountMemberList.stream().filter(i->Constants.equalsInteger(i.getLimitType(),Constants.ZERO)).findAny();
            if(optional.isPresent()){
                return optional.get();
            }
            //处理剩余时间
            for (DiscountMember discountMember:discountMemberList) {
                if(Objects.isNull(discountMember.getUseTime())){
                    discountMember.setSurplusTime(discountMember.getLimitTime());
                }else if(discountMember.getUseTime()>=discountMember.getLimitTime()){
                    discountMember.setSurplusTime(0);
                }else{
                    discountMember.setSurplusTime(discountMember.getLimitTime() - discountMember.getUseTime());
                }
            }
            //骑行中 æ˜¾ç¤ºå‰©ä½™æ—¶é—´æœ€å¤§çš„
            if(Constants.equalsInteger(driveTime,Constants.ZERO)){
                List<DiscountMember>  list =  discountMemberList.stream().filter(i->i.getSurplusTime()>0).collect(Collectors.toList());
                if(list.size()>Constants.ZERO){
                    //d1在前则升序 åä¹‹é™åº
                    list.sort((d1,d2)-> Integer.compare(d2.getSurplusTime(),d1.getSurplusTime()));
                }
                return list.get(Constants.ZERO);
            }else{
                //无无期限的套餐 ä¼˜å…ˆæŸ¥è¯¢å‰©ä½™æ—¶é•¿å¤§äºŽéª‘行时长的信息(取时间最小的套餐) å†æŸ¥è¯¢å°äºŽéª‘行时长的套餐
                List<DiscountMember>  list =  discountMemberList.stream().filter(i->i.getSurplusTime()>=driveTime).collect(Collectors.toList());
                if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
                    if(list.size()>Constants.ZERO){
                        //d1在前则升序 åä¹‹é™åº
                        list.sort((d1,d2)-> Integer.compare(d2.getSurplusTime(),d1.getSurplusTime()));
                    }
                    return list.get(Constants.ZERO);
                }
                list =  discountMemberList.stream().filter(i->i.getSurplusTime()<driveTime).collect(Collectors.toList());
                if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
                    if(list.size()>Constants.ZERO){
                        list.sort((d1,d2)-> Integer.compare(d1.getSurplusTime(),d2.getSurplusTime()));
                    }
                    return list.get(Constants.ZERO);
                }
            }
        }
        return null;
    }


}

 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java

@@ -27,6 +27,7 @@
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.business.web.response.MemberRidesResponse;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.DeviceService;
@@ -509,7 +510,7 @@
            //判断是否处于营业时间
            goodsorderService.checkBusiness();
            //查询是否处于骑行中
            if (memberRidesMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", memberId).in("status", 0, 1)) > Constants.ZERO) {
            if (memberRidesMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", memberId).in("status", 0, 1, 4)) > Constants.ZERO) {
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "存在骑行中车辆，无法扫码");
            }
            String[] codes = code.split("/");
@@ -519,10 +520,6 @@
                    .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(), "扫码无效，该站点锁头暂不支持借出业务哦！");
            }
            //查询锁头是否存在车辆 ä»¥åŠæ˜¯å¦æ­£å¸¸
@@ -573,7 +570,6 @@
        }finally {
            cacheOpenLock.remove(code);
        }

    }

    private boolean isValidePricingType(Locks locks,MemberRides memberRides ) {
@@ -638,6 +634,54 @@
        return true;
    }


    public void dealMemberRidesData(String paramId,MemberRides memberRides){
        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,paramId);
        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);
        //检查是否节假日
        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);
        }
    }

    @Override
    public MemberRidesDetailResponse refreshLock(String id){
        MemberRides memberRides = memberRidesMapper.selectById(id);
@@ -649,6 +693,99 @@
        return memberRidesDetailResponse;
    }


    /**
     * èŽ·å–车辆车型等数据信息
     */
    @Override
    public MemberRidesResponse getBikeChargingRule(String code,String memberId){
        if(StringUtils.isBlank(code)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"请扫描正确的车辆码");
        }
        //查询是否处于骑行中
        if (memberRidesMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", memberId).in("status", 0, 1 ,4 )) > Constants.ZERO) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "存在骑行中车辆，无法扫码");
        }
        Integer bikeType = Constants.ZERO;
        //根据前缀区分是否为电车二维码
        if(code.startsWith(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.ELECTRICITY_PREFIX).getCode())){
            bikeType = Constants.ONE;
        }
        MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
        Bikes bike= new Bikes();
        if(Constants.equalsInteger(bikeType,Constants.ZERO)){
            if(StringUtils.isBlank(code) ||  code.split("/").length != 2){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，该站点编号不存在，请尝试更换车辆！");
            }
            //判断是否处于营业时间
            goodsorderService.checkBusiness();
            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) {
                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]);
                locks.setId(codes[1]);
                deviceService.getLockInfo(locks);
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "当前车辆暂时无法使用，请稍后重试或更换其它车辆！");
            }
            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(), " è¯¥è½¦åž‹æš‚时不能借车操作哦，请更换其他车型重试！");
            }
        }else{
            //查询车辆类型
            bike = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,code).eq(Bikes::getIsdeleted,Constants.ZERO).last(" limit 1 "));
            if(Objects.isNull(bike)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"请扫描正确的车辆码：【未查询到车辆信息】");
            }
            if(StringUtils.isBlank(bike.getParamId())){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"车辆类型异常，请联系管理员！");
            }
            memberRidesResponse.setVoltageStatus(goodsorderService.getVoltageStatus(bike));
        }
        BaseParam baseParam = baseParamMapper.selectById(bike.getParamId());
        if(Objects.isNull(baseParam)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"当前车辆类型无法租赁，请联系管理员！");
        }
        MemberRides memberRides = new MemberRides();
        this.dealMemberRidesData(baseParam.getId(),memberRides);
        memberRidesResponse.setBikeCode(memberRides.getBikeCode());
        memberRidesResponse.setBasePrice(memberRides.getBasePrice());
        memberRidesResponse.setBaseTime(memberRides.getBaseTime());
        memberRidesResponse.setUnitTime(memberRides.getUnitTime());
        memberRidesResponse.setUnitPrice(memberRides.getUnitPrice());
        memberRidesResponse.setPriceRole(PricingDetailServiceImpl.getRoleNameByParam(
                memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
                memberRidesResponse.getUnitPrice()
                ,memberRidesResponse.getUnitTime()));
        return memberRidesResponse;
    }





    /**
     * é”å¤´ä¿¡æ¯ä¸ŠæŠ¥
     * @param locks

 server/web/src/main/java/com/doumee/api/web/BusinessApi.java

@@ -11,9 +11,11 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.request.BackElecBikeRequest;
import com.doumee.dao.business.web.request.OpenElecBikeRequest;
import com.doumee.dao.business.web.request.RepairRequest;
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import com.doumee.dao.business.web.response.MemberRidesResponse;
import com.doumee.dao.business.web.response.RidesDetailResponse;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.jtt808.web.service.Jtt808Service;
@@ -185,6 +187,20 @@
        return ApiResponse.success("操作成功");
    }


    @PreventRepeat
    @LoginRequired
    @ApiOperation(value = "扫码获取车辆信息", notes = "小程序端")
    @GetMapping("/getBikeChargingRule")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "锁头码、电车码", required = true)
    })
    public ApiResponse<MemberRidesResponse> getBikeChargingRule(@RequestParam String code) {
        return  ApiResponse.success("操作成功",memberRidesService.getBikeChargingRule(code,getMemberId()));
    }


    @PreventRepeat
    @LoginRequired
    @ApiOperation(value = "扫码解锁", notes = "小程序端")
@@ -232,6 +248,7 @@
        return  ApiResponse.success("查询成功",systemDictDataBiz.queryByCode(dicCode,label));
    }

    @LoginRequired
    @ApiOperation(value = "电车站点还车", notes = "电车站点还车")
    @PostMapping("/backElecBike")
    public ApiResponse backElecBike(@RequestBody BackElecBikeRequest param) {
@@ -239,6 +256,8 @@
        jtt808Service.backElecBike(param);
        return  ApiResponse.success( null);
    }

    @LoginRequired
    @ApiOperation(value = "电车临时停车", notes = "电车临时停车")
    @PostMapping("/pauseElecBike")
    public ApiResponse pauseElecBike(@RequestBody BackElecBikeRequest param) {
@@ -246,4 +265,25 @@
        jtt808Service.pauseElecBike(param);
        return  ApiResponse.success( null);
    }


    @LoginRequired
    @ApiOperation(value = "电车开锁", notes = "电车开锁")
    @PostMapping("/openElecBike")
    public ApiResponse openElecBike(@RequestBody OpenElecBikeRequest param) {
        param.setMemberId(getMemberId());
        jtt808Service.openLock(param);
        return  ApiResponse.success( null);
    }

    @LoginRequired
    @ApiOperation(value = "临停开锁", notes = "临停开锁")
    @PostMapping("/pauseOpenElecBike")
    public ApiResponse pauseOpenElecBike(@RequestBody BackElecBikeRequest param) {
        param.setMemberId(getMemberId());
        jtt808Service.pauseOpenElecBike(param);
        return  ApiResponse.success( null);
    }


}

 server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java

@@ -20,14 +20,18 @@
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
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,6 +46,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.ConcurrentMap;

@Service
public class Jtt808Service {
@@ -53,40 +58,26 @@
    private BikesMapper bikesMapper;

    @Autowired
    private DiscountMemberMapper discountMemberMapper;

    @Autowired
    private DiscountLogMapper discountLogMapper;

    @Autowired
    GoodsorderJoinMapper goodsorderJoinMapper;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @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;

    @Autowired
    private TransactionsMapper transactionsMapper;
    private PricingParamMapper pricingParamMapper;

    @Autowired
    private WxMiniUtilService wxMiniUtilService;
    private PricingDetailMapper pricingDetailMapper;

    @Autowired
    private HolidaysMapper holidaysMapper;


    @Autowired
    PricingRuleService pricingRuleService;
@@ -253,6 +244,7 @@
        memberRidesJoinMapper.updateById(memberRides);//更新骑行状态为临停中
    }


    private void checkPausePostionBiz(Bikes bike) {
        int ruleType = 0;
        try {
@@ -326,4 +318,227 @@
                    .eq(Bikes::getId,bikes.getId()));
        }
    }

    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(bike.getCode(), 1);
        try {
            //判断当前是否已支付押金
            Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
                    .eq("isdeleted", Constants.ZERO)
                    .eq("status", Constants.goodsorderStatus.pay)
                    .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.ZERO);
            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 (Exception e){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "开锁失败，请联系管理员");
        }finally {
            cacheOpenLock.remove(bike.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);
        Goodsorder goodsorder =  goodsorderService.findOne(gparam);
        if(Objects.isNull(goodsorder)){
            throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"对不起，未查询到您当前有骑行中订单记录");
        }
        //查询当前正在临停中的骑行记录
        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(){
       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)
                .apply(" NOW() >= t.create_date  + INTERVAL '2 hours' ")
        );

        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());
                        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);
        }





    }




}