From 8f5bf5362029b812165b5444286c8c165d3de57a Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Tue, 28 Apr 2026 16:59:41 +0800 Subject: [PATCH] =?UTF-8?q?OMS-=E5=95=86=E4=B8=9A=E5=90=88=E4=BD=9C?= =?UTF-8?q?=E4=BC=99=E4=BC=B4=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/system/api/UserServiceFeign.java | 17 ++++++ .../RemoteUserFeignFallbackFactory.java | 5 ++ .../BusinessPartnerApplicationService.java | 51 ++++++++++++++++++ .../businessPartner/BusinessPartnerDTO.java | 52 +++++++++++++++++++ .../businessPartner/BusinessPartnerApi.java | 30 +++++++++++ 5 files changed, 155 insertions(+) create mode 100644 mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessPartner/BusinessPartnerDTO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessPartner/BusinessPartnerApi.java 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 506727a20..e4e2aa9b2 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 @@ -191,4 +191,21 @@ public interface UserServiceFeign { @ApiOperation("根据用户ID查询货主信息") @GetMapping("/userShipperApi/getShipperByUserId/{userId}") public AjaxResult getShipperByUserId(@PathVariable("userId") Long userId); + + + + + @ApiOperation("商业合作伙伴-分页查询托运人列表") + @GetMapping("/userShipperApi/userShipperList") + public AjaxResult userShipperList(@RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum, + @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize, + @RequestParam(value = "userAccount", required = false) String userAccount, + @RequestParam(value = "shipperEnterpriseName", required = false) String shipperEnterpriseName, + @RequestParam(value = "organizationId", required = false) Long organizationId, + @RequestParam(value = "organizationName", required = false) String organizationName, + @RequestParam(value = "createTimeFrom", required = false) String createTimeFrom, + @RequestParam(value = "createTimeTo", required = false) String createTimeTo, + @RequestParam(value = "updateTimeFrom", required = false) String updateTimeFrom, + @RequestParam(value = "updateTimeTo", required = false) String updateTimeTo, + @RequestParam(value = "shipperType", required = false) Integer shipperType); } \ No newline at end of file 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 08ff38640..f2c96baf3 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 @@ -181,6 +181,11 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory getShipperByUserId(Long userId) { return AjaxResult.error("查询失败" + throwable.getMessage()); } + + @Override + public AjaxResult userShipperList(Integer pageNum, Integer pageSize, String userAccount, String shipperEnterpriseName, Long organizationId, String organizationName, String createTimeFrom, String createTimeTo, String updateTimeFrom, String updateTimeTo, Integer shipperType) { + return AjaxResult.error("查询失败" + throwable.getMessage()); + } }; } } \ No newline at end of file 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 new file mode 100644 index 000000000..ea6a50c8e --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java @@ -0,0 +1,51 @@ +package com.mhd.oms.application.service.businessPartner; + + +import com.mhd.common.core.web.domain.AjaxResult; +import com.mhd.common.core.web.page.TableDataInfo; +import com.mhd.oms.interfaces.dto.businessPartner.BusinessPartnerDTO; +import com.mhd.system.api.UserServiceFeign; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +@Slf4j +public class BusinessPartnerApplicationService { + + @Resource + private UserServiceFeign userServiceFeign; + + + + public TableDataInfo queryShipperPage(BusinessPartnerDTO businessPartnerDTO) { + AjaxResult result = userServiceFeign.userShipperList( + businessPartnerDTO.getPageNum(), + businessPartnerDTO.getPageSize(), + businessPartnerDTO.getUserAccount(), + businessPartnerDTO.getShipperEnterpriseName(), + businessPartnerDTO.getOrganizationId(), + businessPartnerDTO.getOrganizationName(), + businessPartnerDTO.getCreateTimeFrom(), + businessPartnerDTO.getCreateTimeTo(), + businessPartnerDTO.getUpdateTimeFrom(), + businessPartnerDTO.getUpdateTimeTo(), + businessPartnerDTO.getShipperType() + ); + + if ("200".equals((String.valueOf(result.get("code"))))){ + List list = (List) result.get("data"); + + TableDataInfo tableDataInfo = new TableDataInfo(); + tableDataInfo.setData(list); + tableDataInfo.setTotal(list.size()); + tableDataInfo.setCode(200); + return tableDataInfo; + } + return null; + } + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessPartner/BusinessPartnerDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessPartner/BusinessPartnerDTO.java new file mode 100644 index 000000000..af8ba281f --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessPartner/BusinessPartnerDTO.java @@ -0,0 +1,52 @@ +package com.mhd.oms.interfaces.dto.businessPartner; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "商业合作伙伴DTO") +public class BusinessPartnerDTO { + + @ApiModelProperty(value = "登录账号") + private String userAccount; + + @ApiModelProperty(value = "企业名称") + private String shipperEnterpriseName; + + @ApiModelProperty(value = "组织ID") + private Long organizationId; + + @ApiModelProperty(value = "组织名称") + private String organizationName; + + @ApiModelProperty(value = "创建时间起") + private String createTimeFrom; + + @ApiModelProperty(value = "创建时间止") + private String createTimeTo; + + @ApiModelProperty(value = "更新时间起") + private String updateTimeFrom; + + @ApiModelProperty(value = "更新时间止") + private String updateTimeTo; + + @ApiModelProperty(value = "推送时间起") + private String pushTimeFrom; + + @ApiModelProperty(value = "推送时间止") + private String pushTimeTo; + + @ApiModelProperty(value = "货主类型：1-个人，2-企业") + private Integer shipperType; + + @ApiModelProperty(value = "页码") + private Integer pageNum = 1; + + @ApiModelProperty(value = "每页数量") + private Integer pageSize = 10; + + +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessPartner/BusinessPartnerApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessPartner/BusinessPartnerApi.java new file mode 100644 index 000000000..27de7d862 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessPartner/BusinessPartnerApi.java @@ -0,0 +1,30 @@ +package com.mhd.oms.interfaces.facade.businessPartner; + + +import com.mhd.common.core.web.page.TableDataInfo; +import com.mhd.oms.application.service.businessPartner.BusinessPartnerApplicationService; +import com.mhd.oms.interfaces.dto.businessPartner.BusinessPartnerDTO; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + + +@RestController +@RequestMapping("/businessPartnerApi") +public class BusinessPartnerApi { + + @Resource + private BusinessPartnerApplicationService businessPartnerApplicationService; + + @ApiOperation("商业合作伙伴-分页查询委托方列表") + @GetMapping("/shippperList") + public TableDataInfo shipperList(BusinessPartnerDTO businessPartnerDTO){ + return businessPartnerApplicationService.queryShipperPage(businessPartnerDTO); + + } + + +}