bug
jiangping
2023-11-09 be4a0fdd19ca88265ab287eb9dd80380c1b3179d
bug
已修改2个文件
19 ■■■■■ 文件已修改
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -164,7 +164,6 @@
                // 读数据
                inputStream.read(mFileBody);
                locks.setInfo("data:image/Jpeg;base64," + Base64.getEncoder().encodeToString(mFileBody));
            }
        } catch (Exception e) {
            e.printStackTrace();
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -40,9 +40,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ConcurrentReferenceHashMap;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.ConcurrentMap;
import java.util.stream.Collectors;
/**
@@ -418,9 +420,15 @@
    }
    public ConcurrentMap<String,Integer> cacheOpenLock = new ConcurrentReferenceHashMap<>();
    @Override
    public MemberRidesDetailResponse openLock(String code,String memberId) {
        if(Constants.formatIntegerNum(cacheOpenLock.get(code)) == 1){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,该车辆已被锁定借用,请尝试更换其他车辆!");
        }
        cacheOpenLock.put(code, 1);
        try {
        if(StringUtils.isBlank(code) ||  code.split("/").length != 2){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起,该站点编号不存在,请尝试更换车辆!");
        }
@@ -493,8 +501,18 @@
            memberRidesMapper.insert(memberRides);
            BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
            }else{
                throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "当前车辆暂时无法使用,请稍后重试或更换其它车辆~");
        }
        return memberRidesDetailResponse;
        }catch (BusinessException biz){
            throw  biz;
        }catch (Exception biz){
            throw  new BusinessException(ResponseStatus.SERVER_ERROR);
        }finally {
            cacheOpenLock.remove(code);
        }
    }
    private boolean isValidePricingType(Locks locks,MemberRides memberRides ) {