bug

jiangping

2023-10-17 1b0085be0e026847f91c460affb6191c286de883

bug

 server/services/src/main/java/com/doumee/core/model/LoginUserInfo.java

@@ -21,7 +21,7 @@
 */
@Data
public class LoginUserInfo implements Serializable {

    private static final long   serialVersionUID = -5021804768443600712l;
    @ApiModelProperty(value = "编号")
    private String   id         ;//            编号


 server/services/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -3011,6 +3011,9 @@
     * @return
     */
    public static Integer betweenMin(Date begin, Date end) {
        if(begin ==null || end == null){
            return  0;
        }
        long createTime =begin.getTime();//获取创建时间的时间戳
        long currentTime =Objects.isNull(end)?System.currentTimeMillis():end.getTime();//获取当前时间的时间戳
        long diff=(currentTime-createTime)/1000/60;//获取两个时间相差的分钟

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

@@ -90,10 +90,12 @@
                log.info("mqtt消息订阅=========还车==========成功");
            }
        }catch (BusinessException e){
            e.printStackTrace();
            logInfo = "mqtt消息订阅错误==="+e.getMessage();
            result =1;
        }catch (Exception e){
            logInfo = "mqtt消息订阅异常===";
            e.printStackTrace();
            logInfo = "mqtt消息订阅异常==="+e.getMessage();
            result =1;
        }
        createSubLog(topic,msgId,logId,result,param,logInfo);

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

@@ -725,19 +725,20 @@
        update.setDuration(duration>0?duration:0);
        update.setBackType(Constants.ONE);
        update.setBackInfo("用户正常还车");
        update.setId(memberRides.getId());

        Bikes bikes = new Bikes();
        bikes.setSiteId(memberRides.getBackSiteId());
        bikes.setLockId(memberRides.getBackLockId());
//        bikes.setCode(memberRides.getBikeCode());
        bikes = bikesMapper.selectById(new QueryWrapper<>(bikes).last("limit 1"));
        bikes = bikesMapper.selectOne(new QueryWrapper<>(bikes).last("limit 1"));
        if(bikes != null ) {
            UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
            updateWrapper.lambda().set(Bikes::getId, bikes.getId());
            updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
            updateWrapper.lambda().set(Bikes::getEditDate,new Date());
            updateWrapper.lambda().set(Bikes::getLastBackDate,new Date());
            //更新自行车最后还车时间
            bikesMapper.updateById(bikes);
            bikesMapper.update(null,updateWrapper);
        }
        //更新还车记录为已还车
        memberRidesMapper.updateById(update);