From 17bc4b141690f31dba551d82670f0bd1919efcf1 Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Thu, 14 May 2026 08:44:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E4=B8=9A=E5=90=88=E4=BD=9C=E4=BC=99?= =?UTF-8?q?=E4=BC=B4=20total=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/system/api/UserServiceFeign.java | 3 ++- .../factory/RemoteUserFeignFallbackFactory.java | 11 +++++++++-- .../BusinessPartnerApplicationService.java | 17 ++++++++++------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java index fbc1404de..295544734 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java @@ -9,6 +9,7 @@ import com.mhd.common.core.domain.dto.UserDriverDTO; import com.mhd.common.core.domain.entity.R; import com.mhd.common.core.domain.todo.StatisticalMattersDo; import com.mhd.common.core.web.domain.AjaxResult; +import com.mhd.common.core.web.page.TableDataInfo; import com.mhd.system.api.domain.UserDTO; import com.mhd.system.api.domain.UserShipperQueryDTO; import com.mhd.system.api.domain.UserUpdateDTO; @@ -200,7 +201,7 @@ public interface UserServiceFeign { @ApiOperation("商业合作伙伴-分页查询托运人列表") @GetMapping("/userShipperApi/userShipperList") - public AjaxResult userShipperList(@SpringQueryMap UserShipperQueryDTO userShipperQueryDTO); + public TableDataInfo userShipperList(@SpringQueryMap UserShipperQueryDTO userShipperQueryDTO); @PostMapping("/userShipperApi/updatePushStatus") diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java index a3dd70192..3ec982c94 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java @@ -5,6 +5,7 @@ import com.mhd.common.core.domain.dto.StatisticalMattersDTO; import com.mhd.common.core.domain.dto.UserDataPermissionQueryDTO; import com.mhd.common.core.domain.dto.UserDriverDTO; import com.mhd.common.core.web.domain.AjaxResult; +import com.mhd.common.core.web.page.TableDataInfo; import com.mhd.system.api.UserServiceFeign; import com.mhd.system.api.domain.UserDTO; import com.mhd.system.api.domain.UserShipperQueryDTO; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -185,8 +187,13 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory userShipperList(UserShipperQueryDTO userShipperQueryDTO) { - return AjaxResult.error("查询失败" + throwable.getMessage()); + public TableDataInfo userShipperList(UserShipperQueryDTO userShipperQueryDTO) { + TableDataInfo tableDataInfo = new TableDataInfo(); + tableDataInfo.setData(new ArrayList<>()); + tableDataInfo.setTotal(0); + tableDataInfo.setCode(500); + tableDataInfo.setMsg("查询失败:" + throwable.getMessage()); + return tableDataInfo; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java index 6d2cb8c73..0ef8cf865 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java @@ -55,18 +55,20 @@ public class BusinessPartnerApplicationService { userShipperQueryDTO.setOrganizationId(String.valueOf(businessPartnerDTO.getOrganizationId())); } - AjaxResult result = userServiceFeign.userShipperList(userShipperQueryDTO); - - if ("200".equals((String.valueOf(result.get("code"))))){ - List list = (List) result.get("data"); + try { + TableDataInfo userTableDataInfo = userServiceFeign.userShipperList(userShipperQueryDTO); TableDataInfo tableDataInfo = new TableDataInfo(); - tableDataInfo.setData(list); - tableDataInfo.setTotal(list.size()); + tableDataInfo.setData(userTableDataInfo.getData()); + tableDataInfo.setTotal(userTableDataInfo.getTotal()); tableDataInfo.setCode(200); return tableDataInfo; + } catch (Exception e) { + log.error("查询托运人列表异常: {}", e.getMessage()); + TableDataInfo tableDataInfo = new TableDataInfo(); + tableDataInfo.setCode(500); + return tableDataInfo; } - return null; } @@ -77,6 +79,7 @@ public class BusinessPartnerApplicationService { LoginUser loginUser = SecurityUtils.getLoginUser(); Long pushBy = loginUser != null ? loginUser.getUserid() : null; + String pushByName = loginUser != null ? loginUser.getUsername() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;