fix：出场车辆新增判断是否支付过的接口

kongdeqiang

2024-04-07 005f6c2bdea7038cd319dc6dad980428dc897216

fix：出场车辆新增判断是否支付过的接口

 src/main/java/com/boying/controller/car/PlateServlet3.java

@@ -740,9 +740,9 @@
                    }
                }
            }
            if(StringUtils.isBlank(carDay) && !carNo.equals("无车牌")){
            if(StringUtils.isBlank(carDay) && !carNo.equals("无牌车")){
                carDay = "欢迎光临";
            }else if(StringUtils.isBlank(carDay) && carNo.equals("无车牌")){
            }else if(StringUtils.isBlank(carDay) && carNo.equals("无牌车")){
                carDay = "拒绝驶入";
            }

@@ -766,7 +766,7 @@
            String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
            data1 = data1.replaceAll("\r\n", "");

            if(!carNo.equals("无车牌")){
            if(!carNo.equals("无牌车")){
                open(request,response,data1);//入场开闸
            }else {
                noOpen(request,response,data1);
@@ -841,7 +841,7 @@
        String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
        data1 = data1.replaceAll("\r\n", "");
        if(type == 0){
            if(carNo.equals("无车牌")){
            if(carNo.equals("无牌车")){
                noOpen(request,response,data1);
            }else {
                if(timeStamp.contains("记录异常")){

 src/main/java/com/boying/controller/phone/YCPayController.java

@@ -146,6 +146,34 @@
        }
    }

    /**
     * 判断支付端是否已经支付过
     * @param id
     * @return
     */
    @PostMapping("parkJudg")
    public Object parkJudg(Long id){
        if(id == null){
            return R.failed("未找到数据，请稍后重新点击");
        }
        OutPark outPark =  outParkService.getById(id);
        if(outPark == null){
            return R.failed("未找到数据，请稍后重新点击");
        }
        if(StringUtils.isNotBlank(outPark.getPayCode()) && outPark.getStatus() == 0){
            return R.ok(1,"订单已提交支付请求");
        }
        if(StringUtils.isBlank(outPark.getPayCode())){
            OutPark by10min = outParkService.findBy10min(outPark.getCarNo(), outPark.getParkId(), outPark.getCreateTime());
            if(by10min !=null){
                return R.ok(1,"订单已提交支付请求");
            }else {
                return R.ok(0,"请提交支付");
            }
        }
        return R.ok(0,"请提交支付");
    }


    /**
     * 判断是否缴费
@@ -162,7 +190,6 @@
            updateOutPark(outPark.getId(),"03");
            return R.failed("本次停车无需支付费用");
        }

        //判断是否在白名单
        QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
        wrapper.lambda()

 src/main/java/com/boying/service/OutParkService.java

@@ -43,6 +43,6 @@
    OutPark findByOrderId(String txnOrderId);

    OutPark findBy5min(String carNo, Integer parkId, LocalDateTime dateTime);

    OutPark findBy10min(String carNo, Integer parkId, LocalDateTime dateTime);

}

 src/main/java/com/boying/service/impl/OutParkServiceImpl.java

@@ -212,6 +212,23 @@
        }
        return null;
    }
    @Override
    public OutPark findBy10min(String carNo, Integer parkId,LocalDateTime dateTime) {
        LocalDateTime localDateTime = dateTime.minusMinutes(10);
        QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(OutPark::getCarNo,carNo)
                .eq(OutPark::getParkId,parkId)
                .ge(OutPark::getCreateTime,localDateTime)
                .ge(OutPark::getPrice,0)
                .isNotNull(OutPark::getPayCode)
                .isNotNull(OutPark::getEnterTime);
        List<OutPark> outParks = outParkMapper.selectList(wrapper);
        if(outParks != null && outParks.size()>0){
            return outParks.get(0);
        }
        return null;
    }

    @Override
    public List<OutPark> getList(long current, long size, String carNo, Long parkId, String payCode, String date) {