fix:新增订单-车牌号关联表。修复bug

wzp

2025-05-12 e21119007e7d9899376c0dce4ed406a4c2901310

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -1,17 +1,16 @@
package com.ruoyi.quartz.task;

import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.utils.HttpUtil;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.service.IAOrderStatusService;
import com.ruoyi.system.service.IDispatchOrdService;
import com.ruoyi.system.service.ISysClientAppService;
import com.ruoyi.system.service.ITbOrdersService;
import com.ruoyi.system.service.*;
import com.ruoyi.system.service.impl.SysUserServiceImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;
import java.util.Date;

import java.util.HashMap;
import java.util.List;
@@ -26,6 +25,31 @@
public class RyTask
{
    private static final Logger log = LoggerFactory.getLogger(RyTask.class);


    
    // 添加状态映射字典
    private static final Map<String, String> ORDER_STATUS_MAP = new HashMap<String, String>() {{
        put("-1", "无效取消");
        put("1", "未报价");
        put("2", "已报价");
        put("3", "1 - 完全未确认");
        put("4", "2 - 部分已确认");
        put("5", "未出车");
        put("6", "3 - 已出车（去接患者途中）");
        put("7", "已出车（等待患者）");
        put("8", "4 - 已出车（服务中）");
        put("9", "5 - 已送达（回程中）");
        put("10", "已返回");
        put("11", "跑空单，已返回");
        put("12", "取消");
        put("13", "0 - 新调度单（未下发）");
        put("14", "已提交，等待审核");
        put("15", "审核完成");
        put("16", "审核不通过");
        put("17", "已站点");
    }};

    @Autowired
    private IAOrderStatusService orderStatusService;

@@ -37,6 +61,12 @@

    @Autowired
    private ISysClientAppService sysClientAppService;

    @Autowired
    private ITbCallbackLogService tbCallbackLogService;

    @Autowired
    private ITbVehicleOrderService tbVehicleOrderService;

    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
    {
@@ -53,6 +83,9 @@
        System.out.println("执行无参方法");
    }


    

    /**
     * 回调推送状态
     */
@@ -66,7 +99,7 @@
            for (AOrderStatus orderStatus : orderStatusList) {
                int count = tbOrdersService.checkServiceOrdIDExists(orderStatus.getServiceOrdID());
                if (count > 0) {
                    System.out.println("服务订单ID存在：" + orderStatus.getServiceOrdID());
                    log.info("服务订单ID存在：" + orderStatus.getServiceOrdID());

                    TbOrders tbOrders = tbOrdersService.selectTbOrdersByServiceOrdID(orderStatus.getServiceOrdID());

@@ -104,6 +137,38 @@
                                    }
                                }
                            }

                            //如果车牌号不为空
                            if(carLicense!=null && carLicense.length()>0){
                                log.info("更新订单-车牌号关联表，【" + tbOrders.getOrderID() + "】车牌号：" + carLicense);

                                //查询是否存在关联记录
                                TbVehicleOrder tbVehicleOrder = tbVehicleOrderService.selectTbVehicleOrderById(tbOrders.getOrderID());
                                if(tbVehicleOrder==null){
                                    //不存在关联记录
                                    //创建关联记录
                                    tbVehicleOrder = new TbVehicleOrder();
                                    tbVehicleOrder.setOrderId(tbOrders.getOrderID());
                                    tbVehicleOrder.setServiceOrdId(tbOrders.getServiceOrdID());
                                    tbVehicleOrder.setVehicle(carLicense);
                                    tbVehicleOrder.setStatus("0");
                                    tbVehicleOrderService.insertTbVehicleOrder(tbVehicleOrder);
                                }
                                else{
                                    //存在关联记录
                                    //更新关联记录
                                    if(orderStatus.getMsg().contains("已返回"))
                                    {
                                        tbVehicleOrder.setStatus("1");
                                        tbVehicleOrderService.updateTbVehicleOrder(tbVehicleOrder);
                                    }
                                    else if(orderStatus.getMsg().contains("取消"))
                                    {
                                        tbVehicleOrder.setStatus("2");
                                        tbVehicleOrderService.updateTbVehicleOrder(tbVehicleOrder);
                                    }
                                }
                            }
                        }
                    }
                    catch (Exception e)
@@ -111,10 +176,10 @@
                        log.error("获取调度单异常："+e.getMessage());
                    }

                    SysClientApp clientApp = sysClientAppService.selectSysClientAppByAppId(1L);
                    SysClientApp clientApp = sysClientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());
                    if(clientApp==null){
                        log.error("回调地址不存在");
                        return;
                        continue;
                    }

                    String callbackUrl = clientApp.getCallbackUrl();
@@ -123,7 +188,12 @@
                        Map<String, String> map = new HashMap<>();
                        map.put("orderID", tbOrders.getOrderID().toString());
                        map.put("thirdOrderNo", orderStatus.getServiceOrdID());
                        map.put("orderStatus","1");
                        map.put("orderStatus", ORDER_STATUS_MAP.entrySet()
                            .stream()
                            .filter(entry -> entry.getValue().equals(orderStatus.getMsg()))
                            .map(Map.Entry::getKey)
                            .findFirst()
                            .orElse("0"));
                        map.put("orderRemark", orderStatus.getMsg());
                        map.put("plateNo",carLicense);
                        map.put("driverMobile",driverMobiles.toString());
@@ -144,6 +214,9 @@
                            log.info("回调推送成功，参数如下：");
                            map.forEach((key, value) -> log.info("    {} : {}", key, value));
                            orderStatusService.updateAOrderStatusFlag(orderStatus.getId());


                            
                        } else {
                            log.error("回调请求重试后仍然失败");
                            orderStatusService.updateAOrderStatusFlag(orderStatus.getId());
@@ -166,6 +239,16 @@

    // 新增发送回调的方法
    private String sendCallback(String callbackUrl, Map<String, String> params) {
        TbCallbackLog callbackLog = new TbCallbackLog();
        callbackLog.setCallbackUrl(callbackUrl);
        callbackLog.setRequestParams(JSON.toJSONString(params));
        callbackLog.setCreateTime(new Date());
        callbackLog.setStatus("0");  // 默认失败
        callbackLog.setRetryCount(0);
        callbackLog.setServiceOrdId(params.get("thirdOrderNo"));
        callbackLog.setOrderId(Long.valueOf(params.get("orderID")));
        callbackLog.setAppId(params.get("appId"));

        try {
            // 打印请求参数
            log.info("发送回调请求，URL: " + callbackUrl);
@@ -177,9 +260,18 @@
            // 打印响应结果
            log.info("回调响应结果: " + response);
            
            // 更新日志状态
            callbackLog.setResponseResult(response);
            callbackLog.setStatus("1");  // 成功
            
            tbCallbackLogService.insertTbCallbackLog(callbackLog);
            return response;
        } catch (Exception e) {
            log.error("回调请求异常: " + e.getMessage());
            // 记录错误信息
            callbackLog.setErrorMsg(e.getMessage());
            callbackLog.setRetryCount(1);  // 如果是重试的情况下需要+1
            tbCallbackLogService.insertTbCallbackLog(callbackLog);
            return null;
        }
    }