jiangping
2025-02-19 b7d7bb82334af8574ad2510b9fa2220581e3f9f2
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -392,14 +392,14 @@
                bike.setLastBackDate(model.getRentDate());
                bike.setStatus(Constants.ZERO);
                bike.setType(Constants.ZERO);
                bike.setInfo("强制还车绑定");
                bike.setForceBackInfo("强制还车绑定");
                bikesMapper.insert(bike);
            }
        }else{
            //如果是电车,请求web端接口关闭车辆信息
            bike =   sendCloseElecBikeRequest(memberRides.getBikeCode(),Constants.ONE);
        }
        logInfo = bike!=null?bike.getInfo():null;
        logInfo = bike!=null?bike.getForceBackInfo():null;
        Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
        Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate());
        //计算骑行计费时长
@@ -446,7 +446,7 @@
        if(bike == null){
            return null;
        }
        bike.setInfo("强制还车关闭车锁失败!");
        bike.setForceBackInfo("强制还车关闭车锁失败!");
        if(StringUtils.isNotBlank(bike.getDeviceSn())){
            try {
                //请求地址
@@ -458,15 +458,15 @@
                JSONObject json = JSONObject.parseObject(res);
                if(json.get("code").equals("200")){
                    //发起指令成功
                    bike.setInfo("强制还车关闭车锁成功!");
                    bike.setForceBackInfo("强制还车关闭车锁成功!");
                }else{
                    bike.setInfo("强制还车关闭车锁失败!"+json.get("msg"));
                    bike.setForceBackInfo("强制还车关闭车锁失败!"+json.get("msg"));
                }
            }catch (Exception e){
                e.printStackTrace();
            }
        }else{
            bike.setInfo("强制还车关闭车锁失败,未绑定控制器sn!");
            bike.setForceBackInfo("强制还车关闭车锁失败,未绑定控制器sn!");
        }
        bikesMapper.updateById(bike);
        return bike;