修復bug

jiangping

2023-10-19 43119e9cac4750e2dddb2e19c2c5e2eb46ae05ca

修復bug

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

@@ -273,7 +273,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())){

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

@@ -212,10 +212,13 @@
        queryWrapper.lambda().like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Sites::getCode,pageWrap.getModel().getName());
        queryWrapper.lambda().orderByAsc(Sites::getCode);
        IPage<Sites> sitesMonitorDTO = sitesMapper.selectPage(page, queryWrapper);

        if (!CollectionUtils.isEmpty(sitesMonitorDTO.getRecords())){
            sitesMonitorDTO.getRecords().forEach(s->{
                if(Constants.formatIntegerNum(s.getAllLockNum()) >0){
                s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getAllLockNum()),BigDecimal.ROUND_UP).setScale(2));
                }else{
                    s.setRate(new BigDecimal(0.0));
                }
            });
        }