From 6f3c170403f34d452b5dc733043145d8d760fe41 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 05 Sep 2025 18:04:17 +0800
Subject: [PATCH] Merge branch '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 455d421..0df07c5 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
@@ -12,8 +12,7 @@
import com.oying.modules.rider.utils.RiderSourceHttpUtils;
import com.oying.modules.system.domain.User;
import com.oying.modules.system.service.UserService;
-import com.oying.utils.FileUtil;
-import com.oying.utils.SecurityUtils;
+import com.oying.utils.*;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,14 +21,11 @@
import com.oying.modules.rider.mapper.RiderInfoMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.oying.utils.PageUtil;
import java.math.BigDecimal;
import java.util.*;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
-
-import com.oying.utils.PageResult;
/**
* @author pxb
@@ -99,7 +95,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void syncRiderSourceInfo(String sourcePlatform) {
+ public R syncRiderSourceInfo(String sourcePlatform) {
Long riderId = SecurityUtils.getCurrentUserId();
// 添加请求参数
List<String> phoneList = new ArrayList<>();
@@ -165,9 +161,17 @@
// 添加变更记录...
}
}
+ return R.success(riderInfo, "获取骑手三方数据");
} else {
+ // 修改骑手信息为信息失效
+ if(riderInfo != null) {
+ RiderInfo newRiderInfo = new RiderInfo();
+ newRiderInfo.setRiderId(riderId);
+ newRiderInfo.setEnabled(Constants.SOURCE_ENABLED_DFF);
+ updateById(newRiderInfo);
+ }
// 获取骑手三方数据为空，抛出异常
- throw new BadRequestException("获取骑手三方数据为空");
+ return R.fail(null, "获取骑手三方数据为空");
}
} else {
// 获取骑手三方数据失败，抛出异常
--
Gitblit v1.9.3