From 09e0146b9379e06351e7bd5b9bdc5b1700ab133b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 15 四月 2026 18:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/ReassignOrderController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/ReassignOrderController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/ReassignOrderController.java
index d3b1f19..7c8b69b 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/ReassignOrderController.java
+++ b/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,49 @@
public class ReassignOrderController {
@Autowired
private TaskOrderUtil taskOrderUtil;
+ @Resource
+ private RedisService redisService;
+ @Resource
+ private XpOrderReassignClient xpOrderReassignClient;
+ /**
+ * 重新改派
+ * @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() {
+// System.out.println("3秒执行一次");
+ //从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());
+ xpOrderReassignClient.saveOrderReassign(reassign2);
+ }
+ }
+ }
+
+ }
+
+
+
}
--
Gitblit v1.7.1