跨城改派fix

longz

2026-06-30 bcfeaf551a586ab6898bf6dc5c5995e2e03a4f11

 DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java

@@ -1444,48 +1444,48 @@
    }

    /**
     * 通知原司机改派成功
     * 通知原司机改派成功（使用Socket推送）
     */
    private void pushReassignSuccess(Reassign reassign) {
        try {
            Map<String, String> data = new HashMap<>();
            data.put("type", "REASSIGN_SUCCESS");
            data.put("reassignId", String.valueOf(reassign.getId()));
            data.put("orderId", String.valueOf(reassign.getOrderId()));

            jgPushUtil.push(2, "您的改派申请已被接受", "改派成功", data, "DRIVER" + reassign.getOriginalDriverId());
            pushUtil.pushReassignSuccess(
                reassign.getOriginalDriverId(),
                reassign.getId(),
                reassign.getOrderId(),
                reassign.getOrderType()
            );
        } catch (Exception e) {
            e.printStackTrace();
        }
    }

    /**
     * 通知原司机改派被拒绝
     * 通知原司机改派被拒绝（使用Socket推送）
     */
    private void pushReassignRejected(Reassign reassign) {
        try {
            Map<String, String> data = new HashMap<>();
            data.put("type", "REASSIGN_REJECTED");
            data.put("reassignId", String.valueOf(reassign.getId()));
            data.put("orderId", String.valueOf(reassign.getOrderId()));

            jgPushUtil.push(2, "对方拒绝了您的改派申请", "改派被拒绝", data, "DRIVER" + reassign.getOriginalDriverId());
            pushUtil.pushReassignRejected(
                reassign.getOriginalDriverId(),
                reassign.getId(),
                reassign.getOrderId(),
                reassign.getOrderType()
            );
        } catch (Exception e) {
            e.printStackTrace();
        }
    }

    /**
     * 通知原司机改派超时
     * 通知原司机改派超时（使用Socket推送）
     */
    private void pushReassignTimeout(Reassign reassign) {
        try {
            Map<String, String> data = new HashMap<>();
            data.put("type", "REASSIGN_TIMEOUT");
            data.put("reassignId", String.valueOf(reassign.getId()));
            data.put("orderId", String.valueOf(reassign.getOrderId()));

            jgPushUtil.push(2, "改派申请已超时，请重新选择", "改派超时", data, "DRIVER" + reassign.getOriginalDriverId());
            pushUtil.pushReassignTimeout(
                reassign.getOriginalDriverId(),
                reassign.getId(),
                reassign.getOrderId(),
                reassign.getOrderType()
            );
        } catch (Exception e) {
            e.printStackTrace();
        }