修改bug

Pu Zhibing

2025-08-05 d8f0615909cedc1446da7c06b2ab7599abe07c9d

修改bug

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java

@@ -102,11 +102,7 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (shiroExtUtil.getUser().getRoleType() != 1) {
            page.setRecords(null);
        } else {
            page.setRecords(tInvoiceService.getInvoiceList(page, beginTime, endTime, email, name, type, state,companyId));
        }
        page.setRecords(tInvoiceService.getInvoiceList(page, beginTime, endTime, email, name, type, state,companyId));
        return super.packForBT(page);
    }


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

@@ -562,8 +562,8 @@
                        return ResultUtil.error("请先配置价格规则");
                    }
                    Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId(), systemPriceCity.getId());
                    System.out.println("参数：" + orderPrivateCar.getCompanyId() + "|" + orderPrivateCar.getServerCarModelId());
                    System.out.println("query1:" + query1);
//                    System.out.println("参数：" + orderPrivateCar.getCompanyId() + "|" + orderPrivateCar.getServerCarModelId());
//                    System.out.println("query1:" + query1);
                    //开始根据不同的方式计算金额
                    if (query1 != null) {
                        JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());//等待费

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

@@ -2737,7 +2737,7 @@
        paymentRecordService.updateById(query);
        OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
        SysIntegral query1 = sysIntegralMapper.query(openCity.getId());
        System.out.println("query1:" + query1);
//        System.out.println("query1:" + query1);
        userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
        
        //添加交易明细

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

@@ -105,9 +105,9 @@
     */
    public Map<String, String> geocode(String lon, String lan) throws Exception{
        String url = "https://restapi.amap.com/v3/geocode/regeo?key=" + key + "&location=" + lon + "," + lan;
        System.err.println("根据经纬度获取行政区域信息[请求]---->" + url);
//        System.err.println("根据经纬度获取行政区域信息[请求]---->" + url);
        String forObject = restTemplate.getForObject(url, String.class);
        System.err.println("根据经纬度获取行政区域信息[响应]---->" + forObject);
//        System.err.println("根据经纬度获取行政区域信息[响应]---->" + forObject);
        JSONObject jsonObject = JSON.parseObject(forObject);
        Map<String, String> map = new HashMap<>();
        if(jsonObject.getString("status").equals("1")){

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

@@ -11,6 +11,8 @@
import lombok.extern.slf4j.Slf4j;

import java.math.BigDecimal;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.text.SimpleDateFormat;
import java.util.*;

@@ -505,7 +507,14 @@
        tradePayOffData.setScene("TRAFFIC");
        tradePayOffData.setCurrency("RMB");
        tradePayOffData.setRetUrl("");
        tradePayOffData.setClientIp(System.getProperty("http.remoteAddr"));
        InetAddress inetAddress = null;
        try {
            inetAddress = InetAddress.getLocalHost();
        } catch (UnknownHostException e) {
            throw new RuntimeException(e);
        }
        String ip = inetAddress.getHostAddress();
        tradePayOffData.setClientIp(ip);
        tradePayOffData.setNeedLoginFlag("N");
        tradePayOffData.setAccessMode("APP");
        List<PaymentInfoRequest> paymentInfoRequests = new ArrayList<>();