Merge remote-tracking branch 'origin/master'

kongdeqiang

2024-04-09 68270a251b81502f815ecbd04cb2ab23f3978d24

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

@@ -164,14 +164,14 @@
            return R.ok(1,"订单已提交支付请求");
        }
        if(StringUtils.isBlank(outPark.getPayCode())){
            OutPark by10min = outParkService.findBy10min(outPark.getCarNo(), outPark.getParkId(), outPark.getCreateTime());
            OutPark by10min = outParkService.findBy10min(outPark.getCarNo(), outPark.getParkId(), outPark.getCreateTime(),outPark.getId());
            if(by10min !=null){
                return R.ok(1,"订单已提交支付请求");
            }else {
                return R.ok(0,"请提交支付");
            }
        }
        return R.ok(0,"请提交支付");
        return R.failed(0,"请提交支付");
    }