From 0ef280ca1db4c8f280be5030ccfea35441ca1e51 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Wed, 16 Jul 2025 11:24:29 +0800
Subject: [PATCH] 骑手同步数接口修改
---
oying-system/src/main/java/com/oying/modules/rider/utils/RiderSourceHttpUtils.java | 14 ++++++++------
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 2 +-
oying-system/src/main/java/com/oying/modules/rider/domain/RiderSourceInfoHttp.java | 3 ++-
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderInfoServiceImpl.java | 10 +++++++---
4 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderSourceInfoHttp.java b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderSourceInfoHttp.java
index 89750da..e9918ec 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderSourceInfoHttp.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderSourceInfoHttp.java
@@ -4,6 +4,7 @@
import lombok.Setter;
import java.io.Serializable;
+import java.util.List;
/**
* @description /
@@ -18,6 +19,6 @@
private String message;
- private RiderSourceInfo data;
+ private List<RiderSourceInfo> data;
}
diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderInfoServiceImpl.java b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderInfoServiceImpl.java
index a3d6291..0ffe8ab 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderInfoServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderInfoServiceImpl.java
@@ -101,13 +101,17 @@
@Transactional(rollbackFor = Exception.class)
public void syncRiderSourceInfo(String sourcePlatform) {
Long riderId = SecurityUtils.getCurrentUserId();
+ // 添加请求参数
+ List<String> phoneList = new ArrayList<>();
+ phoneList.add(SecurityUtils.getCurrentUsername());
// 查询其他平台的数据
- RiderSourceInfoHttp riderSourceInfoHttp = RiderSourceHttpUtils.getRiderSourceInfoHttp(SecurityUtils.getCurrentUsername(), sourcePlatform);
+ RiderSourceInfoHttp riderSourceInfoHttp = RiderSourceHttpUtils.getRiderSourceInfoHttp(phoneList, sourcePlatform);
// 请求成功
if (riderSourceInfoHttp.getCode().equals(Constants.HTTP_CODE_SUCCESS)) {
// 获取骑手信息等于空
- if (null != riderSourceInfoHttp.getData()) {
- RiderSourceInfo infoHttpData = riderSourceInfoHttp.getData();
+ if (!riderSourceInfoHttp.getData().isEmpty()) {
+ // 单个骑手信息同步只取第一条数据
+ RiderSourceInfo infoHttpData = riderSourceInfoHttp.getData().get(0);
// 检查是否存在该平台的骑手信息
QueryWrapper<RiderInfo> riderInfoQueryWrapper = new QueryWrapper<>();
riderInfoQueryWrapper.eq(RiderInfo.COL_RIDER_ID, riderId);
diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
index ca6daee..993f8eb 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
@@ -146,7 +146,7 @@
// 查询当前订单 检查订单是否已经被其他骑手抢到或取消 直接返回
OrderResponse orderResponse = orderService.getByOrderNum(orderNum);
// 2商家已接单 4商家已备货 这两个状态可以接单
- if (orderResponse == null || orderResponse.getOrder().getOrderStatus() != 2 || orderResponse.getOrder().getOrderStatus() != 4) {
+ if (null == orderResponse || (orderResponse.getOrder().getOrderStatus() != 2 && orderResponse.getOrder().getOrderStatus() != 4)) {
return R.fail(400, "订单已经被其他骑手接单或顾客取消，请稍后重试");
}
// 订单没有被接单或取消的情况下，进行接单操作
diff --git a/oying-system/src/main/java/com/oying/modules/rider/utils/RiderSourceHttpUtils.java b/oying-system/src/main/java/com/oying/modules/rider/utils/RiderSourceHttpUtils.java
index 346d4ed..3112573 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/utils/RiderSourceHttpUtils.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/utils/RiderSourceHttpUtils.java
@@ -12,6 +12,8 @@
import org.slf4j.LoggerFactory;
import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
@@ -66,15 +68,15 @@
* @return: riderSourceInfoHttp
* @author: pxb
*/
- public static RiderSourceInfoHttp getRiderSourceInfoHttp(String phone, String sourcePlatform) {
- HashMap<String, Object> paramMap = new HashMap<>(2);
- paramMap.put("phone", phone);
- paramMap.put("sourcePlatform", sourcePlatform);
+ public static RiderSourceInfoHttp getRiderSourceInfoHttp(List<String> phones, String sourcePlatform) {
+ HashMap<String, Object> param = new HashMap<>(2);
+ param.put("phones", phones);
+ param.put("sourcePlatform", sourcePlatform);
// String url = "";
// 转化成对象
RiderSourceInfoHttp riderSourceInfoHttp = new RiderSourceInfoHttp();
// try {
- // String result = httpPostRequest(paramMap, url);
+ // String result = httpPostRequest(param, url);
// // 转换数据
// riderSourceInfoHttp = riderConvertUtils(result);
// } catch (Exception e) {
@@ -91,7 +93,7 @@
riderSourceInfo.setPhone("18706999997");
riderSourceInfo.setCardName("张三");
riderSourceInfo.setEnabled(Constants.SOURCE_ENABLED_ON);
- riderSourceInfoHttp.setData(riderSourceInfo);
+ riderSourceInfoHttp.getData().add(riderSourceInfo);
return riderSourceInfoHttp;
}
--
Gitblit v1.9.3