修改bug

Pu Zhibing

2025-11-14 7c49bd92fd7e25743928e7e6cf305cdd2f877527

修改bug

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/AdvertisementController.java

@@ -37,7 +37,6 @@
    })
    public ResultUtil<List<AdvertisementWarpper>> queryAdvertisement(String code, Integer type){
        try {
            System.out.println("code:"+code);
            List<AdvertisementWarpper> advertisementWarpper = advertisementService.queryAdvertisement(code, type);
            return ResultUtil.success(advertisementWarpper);
        }catch (Exception e){

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/newlyAdded/NewlyAddedController.java

@@ -21,6 +21,7 @@

import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -232,11 +233,10 @@
    })
    public ResultUtil<List<TbShowModular>> getShowModular(String lon, String lat, HttpServletRequest request){
        try {
//            Integer uid = userInfoService.getUserIdFormRedis(request);
//            if(null == uid){
//                return ResultUtil.tokenErr();
//            }
            OpenCity openCity = openCityService.openCity1(lon, lat);
            if(null == openCity){
                return ResultUtil.success(new ArrayList<>());
            }
            return ResultUtil.success(showModularService.selectList(new EntityWrapper<TbShowModular>().eq("openCityId",openCity.getId())));
        }catch (Exception e){
            e.printStackTrace();

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java

@@ -486,6 +486,14 @@
     */
    private Integer isCreated;
    /**
     * 备付金支付次数
     */
    private Integer bfPayNumber;
    /**
     * 备付金支付失败原因
     */
    private String bfPayFailure;
    /**
     * 是否是追缴单（0=否，1=是）
     */
    private Integer recoveryOrder;
@@ -1384,6 +1392,22 @@
        this.abnormalRemark = abnormalRemark;
    }

    public Integer getBfPayNumber() {
        return bfPayNumber;
    }

    public void setBfPayNumber(Integer bfPayNumber) {
        this.bfPayNumber = bfPayNumber;
    }

    public String getBfPayFailure() {
        return bfPayFailure;
    }

    public void setBfPayFailure(String bfPayFailure) {
        this.bfPayFailure = bfPayFailure;
    }

    @Override
    public String toString() {
        return "OrderPrivateCar{" +

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -1249,6 +1249,9 @@
                    .eq("isDelete", 1)
                    .in("state", Arrays.asList(2, 3, 4, 5, 6, 7))
            );
            if(null == orderId){
                return new HashMap<>();
            }
            return orderTaxiService.queryOrderInfo(orderTaxi.getId());
        }
        if(null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2){//改派完成，重新获取了新的司机数据，开始修改数据防止继续调用
@@ -2937,6 +2940,9 @@
                            }
                            Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
                            OrderPrivateCar orderPrivateCar1 = orderPrivateCarMapper.selectById(orderPrivateCar.getId());
                            if(null == orderPrivateCar1){
                                break;
                            }
                            Integer state =orderPrivateCar1.getState();
                            if (state > 1) {
                                orderIds.remove(orderPrivateCar.getId());

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java

@@ -93,6 +93,9 @@
    @Override
    public OpenCity openCity1(String lon, String lat) throws Exception {
        Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat);
        if(null == geocode){
            return null;
        }
        String districtCode = geocode.get("districtCode");
        return openCity1(districtCode);
    }

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java

@@ -34,6 +34,9 @@
    public List<Phone> queryPhones(String code) throws Exception {
        if(ToolUtil.isNotEmpty(code)){
            OpenCity openCity = openCityService.openCity1(code);
            if(null == openCity){
                return new ArrayList<>();
            }
            return phoneMapper.selectList(new EntityWrapper<Phone>().eq("openCityId", openCity.getId()));
        }
        return new ArrayList<>();
@@ -50,6 +53,9 @@
    public Map<String, Object> queryCustomerPhone(String code) throws Exception {
        Map<String, Object> map = new HashMap<>();
        OpenCity openCity = openCityService.openCity1(code);
        if(null == openCity){
            return new HashMap<>();
        }
        Phone phone = this.selectOne(new EntityWrapper<Phone>().eq("openCityId", openCity.getId()).eq("type", 2).eq("platform", 1));
        map.put("platform", null != phone ? phone.getPhone() : "");
        phone = this.selectOne(new EntityWrapper<Phone>().eq("openCityId", openCity.getId()).eq("type", 2).eq("platform", 2));

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java

@@ -52,6 +52,9 @@
import java.security.spec.AlgorithmParameterSpec;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -211,9 +214,6 @@
            return true;
        }
        Object value = redisTemplate.opsForValue().get(phone);
        System.out.println("phone:" + phone);
        System.out.println("code:" + code);
        System.out.println("code---" + String.valueOf(value));
        if (null != value && code.equals(String.valueOf(value))) {
            return true;
        } else {
@@ -775,6 +775,27 @@

        //调用单点登录的逻辑
        this.singlePointLogin(userInfo.getId(),loginType);
        //定时任务查询新用户的易信ID
        if(ToolUtil.isEmpty(userInfo.getOnconUUID())){
            ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1);
            UserInfo finalUserInfo1 = userInfo;
            executorService.schedule(()->{
                while (true){
                    String onconUUIDByMobile = UserUtil.getOnconUUIDByMobile(finalUserInfo1.getPhone());
                    if(ToolUtil.isEmpty(onconUUIDByMobile)){
                        try {
                            Thread.sleep(5000);
                        } catch (InterruptedException e) {
                            throw new RuntimeException(e);
                        }
                        continue;
                    }
                    finalUserInfo1.setOnconUUID(onconUUIDByMobile);
                    this.updateById(finalUserInfo1);
                    break;
                }
            }, 10, TimeUnit.SECONDS);
        }

        String token = this.getToken(userInfo, "",loginType);
        LoginWarpper loginWarpper = new LoginWarpper();

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java

@@ -119,6 +119,9 @@
            String province = addressComponent.getString("province");
            String city = addressComponent.getString("city");
            String district = addressComponent.getString("district");
            if(ToolUtil.isEmpty(code)){
                return null;
            }
            map.put("province", province);
            map.put("provinceCode", code.substring(0, 2) + "0000");
            map.put("city", city);

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java

@@ -98,8 +98,8 @@
                e.printStackTrace();
            }
        }

    }

    

    
@@ -149,9 +149,11 @@
     */
    public void timoutNoPayment() {
        List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("state", 7)
                .eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 1).last(" and now() >= DATE_ADD(getoffTime, INTERVAL 72 HOUR)"));
                .eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 1).lt("bfPayNumber", 5)
                .last(" and now() >= DATE_ADD(getoffTime, INTERVAL 72 HOUR)"));
        List<OrderPrivateCar> orderPrivateCars1 = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("state", 7)
                .eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 2).last(" and now() >= DATE_ADD(abnormalTime, INTERVAL 72 HOUR)"));
                .eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 2).lt("bfPayNumber", 5)
                .last(" and now() >= DATE_ADD(abnormalTime, INTERVAL 72 HOUR)"));
        orderPrivateCars.addAll(orderPrivateCars1);
        for (OrderPrivateCar orderPrivateCar : orderPrivateCars) {
            try {
@@ -181,14 +183,19 @@
                tradePayOffData.setOrderDesc("完成订单");
                PayInfo payInfo = OrderUtil.tradePayOff(tradePayOffData);
                String retCode = payInfo.getRetCode();
                orderPrivateCar.setBfPayNumber(orderPrivateCar.getBfPayNumber() + 1);
                if (!"000000".equals(retCode)) {
                    log.error("备付金支付失败：{}", payInfo.getRetMsg());
                    orderPrivateCar.setBfPayFailure(payInfo.getRetMsg());
                    orderPrivateCarService.updateById(orderPrivateCar);
                    return;
                }
                PayInfoData data = payInfo.getData();
                String status = data.getStatus();
                if ("3".equals(status)) {
                    log.error("备付金支付失败：{}", payInfo.getRetMsg());
                    orderPrivateCar.setBfPayFailure(payInfo.getRetMsg());
                    orderPrivateCarService.updateById(orderPrivateCar);
                    return;
                }
                if("0".equals(status)){

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -2362,6 +2362,9 @@
                            }
                            Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
                            OrderPrivateCar orderTaxi1 = orderPrivateCarService.selectById(orderTaxi.getId());
                            if(null == orderTaxi1){
                                break;
                            }
                            Integer state = orderTaxi1.getState();
                            if (state != 1) {
                                push = true;