From 1b1215fbeb15f860e134a0ae32bbe0fb11926446 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Fri, 05 Sep 2025 12:19:03 +0800
Subject: [PATCH] 骑手认证立研平台信息
---
oying-system/src/main/java/com/oying/modules/rider/service/RiderInfoService.java | 3 ++-
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 2 +-
oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java | 4 ++--
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderInfoServiceImpl.java | 18 +++++++++++-------
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java b/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java
index 27f8b21..e49e0bb 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java
@@ -57,8 +57,8 @@
@ApiOperation("同步查询第三方骑手信息 LY")
// @PreAuthorize("@el.check('riderInfo:edit')")
public ResponseEntity<?> syncRiderSourceInfo(@PathVariable String sourcePlatform) {
- riderInfoService.syncRiderSourceInfo(sourcePlatform);
- return ResponseEntity.ok(R.success("操作成功"));
+ R result = riderInfoService.syncRiderSourceInfo(sourcePlatform);
+ return ResponseEntity.ok(result);
}
@GetMapping("getRiderWalletInfo/{riderId}")
diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/RiderInfoService.java b/oying-system/src/main/java/com/oying/modules/rider/service/RiderInfoService.java
index 4ab7577..7cd0858 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/service/RiderInfoService.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/RiderInfoService.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.oying.utils.PageResult;
+import com.oying.utils.R;
/**
* @description 服务接口
@@ -61,7 +62,7 @@
* 同步其他平台的骑手信息
* @param sourcePlatform /
*/
- void syncRiderSourceInfo(String sourcePlatform);
+ R syncRiderSourceInfo(String sourcePlatform);
/**
* 查询其他平台的骑手信息
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 {
// 获取骑手三方数据失败，抛出异常
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 c202bcf..2243add 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
@@ -302,7 +302,7 @@
// 返回参数
orderResponse.getOrder().setOrderStatus(OrderStatusEnum.SEVEN.getKey());
// 查询骑手钱包信息
- RiderWalletInfo riderWalletInfo = riderWalletInfoService.getRiderWalletInfo(String.valueOf(order.getRiderId()));
+ RiderWalletInfo riderWalletInfo = riderWalletInfoService.getRiderWalletInfo(order.getRiderId());
// 修改骑手钱包信息 // 骑手总金额添加配送费
riderWalletInfo.setAmount(riderWalletInfo.getAmount().add(order.getSendPrice()));
// 骑手可用余额添加配送费
--
Gitblit v1.9.3