合并代码

puzhibing

2026-05-17 993a6e6ea8ae047b9e5fffd249ae7adfcd650d3a

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/ReassignOrderController.java

@@ -1,13 +1,20 @@
package com.xiaopeng.operation.controller;

import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.api.dto.operation.ReassignOrderDTO;
import com.xiaopeng.api.feignClient.order.XpOrderReassignClient;
import com.xiaopeng.api.model.order.XpOrderReassign;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.redis.service.RedisService;
import com.xiaopeng.operation.utils.TaskOrderUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

/**
 * token 控制
@@ -19,11 +26,50 @@
public class ReassignOrderController {
    @Autowired
    private TaskOrderUtil taskOrderUtil;
    @Resource
    private RedisService redisService;
    @Resource
    private XpOrderReassignClient xpOrderReassignClient;

    @PostMapping("/inner/v1/order/reassignOrder")
    /**
     * 重新改派
     * @param dto
     * @return
     */
    @PostMapping("/logan/inner/v1/order/reassignOrder")
    public R<String> reassignOrder(@RequestBody ReassignOrderDTO dto) {
        taskOrderUtil.reassignPushOrder(dto.getCount(),dto.getUid(),dto.getLongitude(),dto.getLatitude(),dto.getOrderNo());
        //保存改派记录
        XpOrderReassign reassign = taskOrderUtil.reassignPushOrder(dto.getCount(), dto.getUid(), dto.getLongitude(), dto.getLatitude(), dto.getOrderNo());

        //未找到车 系统强制取消订单，状态流转至“系统自动取消”。 自动退回优惠卷
        xpOrderReassignClient.saveOrderReassign(reassign);
        return R.ok();
    }


    /**
     * 5秒执行一次
     *将需要改派的订单信息保存在redis ,ReassignOrderController 这个类的 taskReassignPushOrder 方法异步 处理信息。
     */
    @Scheduled(cron = "0/3 * * * * ?")
    public void taskReassignPushOrder() {
        //从redis 获取数据 同步 处理数据
        R<List<XpOrderReassign>> r = xpOrderReassignClient.findListOrderReassign();
        if(r.getCode()==200 && !r.getData().isEmpty()){

            for (XpOrderReassign reassign : r.getData()) {
                //改派次数小4
                if(!reassign.getIsComplete() && reassign.getReassignNum()<=3){
                    XpOrderReassign reassign2 = taskOrderUtil.reassignPushOrder(10, String.valueOf(reassign.getAppUserId()),reassign.getLongitude(),reassign.getLatitude(),reassign.getOrderNumber());
                    if(null != reassign2){
                        xpOrderReassignClient.saveOrderReassign(reassign2);
                    }
                }
            }
        }

    }



}