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; } 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); 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, "订单已经被其他骑手接单或顾客取消,请稍后重试"); } // 订单没有被接单或取消的情况下,进行接单操作 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; }