订阅

jiangping

2023-10-17 39adc067cbc7e8ffbc9ecc9fc0a57f4efac6353a

订阅

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

@@ -1,5 +1,6 @@
package com.doumee.core.constants;

import ch.qos.logback.core.util.COWArrayList;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang3.StringUtils;

@@ -33,6 +34,8 @@
    public static final String PROJECTS = "PROJECTS";
    public static final String FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
    public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
    //车辆类型数据
    public static final String  BIKE_TYPE ="1,2,3,4,5,6,7,8" ;
    public static String REDIS_DEBUG_STR="test_";
    public static final String AD = "AD";
    public  interface MqttTopic{

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

@@ -397,6 +397,9 @@

    @Override
    public MemberRidesDetailResponse openLock(String code,String memberId) {
        if(StringUtils.isBlank(code) ||  code.split("/").length != 2){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，该站点编号不存在，请尝试更换车辆！");
        }
        //判断当前是否已支付押金
        Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
                .eq("isdeleted", Constants.ZERO)
@@ -417,7 +420,12 @@
        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"));
        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(), "扫码无效，未查询到锁头信息");
        }
@@ -440,7 +448,7 @@
            memberRides.setMemberId(memberId);
            memberRides.setCreateDate(new Date());
            memberRides.setRentSiteId(locks.getSiteId());
            memberRides.setRentLockId(locks.getId());
            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()));
@@ -455,7 +463,7 @@

    private boolean isValidePricingType(Locks locks,MemberRides memberRides ) {
        Bikes bike= new Bikes();
        bike.setLockId(locks.getId());
        bike.setLockId(locks.getCode());
        bike.setSiteId(locks.getSiteId());
        //查询车辆信息
        bike = bikesMapper.selectOne(new QueryWrapper<>(bike).last("limit 1"));
@@ -560,7 +568,7 @@

    private Bikes dealBikesByParam(Locks model) {
        QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
        wrapper.lambda().eq(Bikes::getLockId, model.getId());
        wrapper.lambda().eq(Bikes::getLockId, model.getCode());
        wrapper.lambda().eq(Bikes::getSiteId, model.getSiteId());
        Bikes bikes = bikesMapper.selectOne(wrapper.last("last 1"));
        if(bikes != null ) {
@@ -579,7 +587,7 @@
            bikes.setIsdeleted(Constants.ZERO);
            bikes.setCreateDate(new Date());
            bikes.setSiteId(model.getSiteId());
            bikes.setLockId(model.getId());
            bikes.setLockId(model.getCode());
            bikes.setCode(model.getBikeCode());
            bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
            bikesMapper.insert(bikes);
@@ -598,7 +606,7 @@
            return  null;
        }
        String type = bikeCode.substring(0,1);
        if("1,2,3,4,5,6,7,8".contains(type)){
        if(Constants.BIKE_TYPE.contains(type)){
            return null;
        }
        BaseParam param = new BaseParam();