From 0526acc407572d23b1030e0ffd842406ae0bc121 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb' into xin
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderInfoServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
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..455d421 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,17 +101,21 @@
@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)) {
+ // 检查是否存在该平台的骑手信息
+ QueryWrapper<RiderInfo> riderInfoQueryWrapper = new QueryWrapper<>();
+ riderInfoQueryWrapper.eq(RiderInfo.COL_RIDER_ID, riderId);
+ RiderInfo riderInfo = riderInfoMapper.selectOne(riderInfoQueryWrapper);
// 获取骑手信息等于空
- if (null != riderSourceInfoHttp.getData()) {
- RiderSourceInfo infoHttpData = riderSourceInfoHttp.getData();
- // 检查是否存在该平台的骑手信息
- QueryWrapper<RiderInfo> riderInfoQueryWrapper = new QueryWrapper<>();
- riderInfoQueryWrapper.eq(RiderInfo.COL_RIDER_ID, riderId);
- RiderInfo riderInfo = riderInfoMapper.selectOne(riderInfoQueryWrapper);
+ if (!riderSourceInfoHttp.getData().isEmpty()) {
+ // 单个骑手信息同步只取第一条数据
+ RiderSourceInfo infoHttpData = riderSourceInfoHttp.getData().get(0);
// 如果存在该平台的骑手信息
if (null == riderInfo) {
// 如果不存在，则创建新的骑手三方信息
--
Gitblit v1.9.3