fix ： 新增修改出场接口

kongdeqiang

2024-12-04 80cacfd0dcee0174f2a8d9ae322a2fcf857cef63

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

@@ -2,7 +2,6 @@

import cn.hutool.http.Header;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,17 +12,15 @@
import com.boying.entity.*;
import com.boying.service.*;
import com.boying.util.DateUtilOther;
import com.boying.util.HTTPEntityUtil;
import com.boying.util.RedisJsonUtil;
import com.google.gson.Gson;

import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -38,7 +35,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;


/**
 * @author kdq
@@ -63,7 +60,7 @@
    private final EnterParkService enterParkService;
    private final WXService wxService;
    private final OutParkLogService outParkLogService;
    private final RedisJsonUtil redisJsonUtil;
    private  final StringRedisTemplate redisTemplate;


    /**
@@ -150,6 +147,37 @@
        }
    }

    /**
     * 判断支付端是否已经支付过
     * @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.isNotBlank(outPark.getPayCode()) && outPark.getStatus() == 1){
            return R.failed(0,"订单已缴费");
        }
        if(StringUtils.isBlank(outPark.getPayCode())){
            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.failed(0,"请提交支付");
    }


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

        //判断是否在白名单
        QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
        wrapper.lambda()
@@ -686,11 +713,8 @@
                outPark.setStatus(1);
                outParkService.saveOrUpdate(outPark);
                //缓存在redis里
                try {
                    redisJsonUtil.set("outPark-"+outPark.getBarrierId(), outPark);
                } catch (IOException e) {
                    e.printStackTrace();
                }
                String jsonValue = JSON.toJSONString(outPark);
                redisTemplate.opsForValue().set("outPark-"+outPark.getBarrierId(), jsonValue);
            }
        }
    }