From 969afd4a6a2b8a7ad5f6f4b55c127ff15c5bd85e Mon Sep 17 00:00:00 2001 From: yewj Date: Sun, 8 Sep 2024 15:57:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOriginController.java | 1 + .../api/req/thrsys/FilterThrOrderRequest.java | 1 + .../api/service/collect/DownloadFactory.java | 15 +++++----- .../collect/down/ThrOrderDownload.java | 30 ++++++++++--------- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java index 2b94e7256..98ca7fa19 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -30,6 +30,7 @@ public class IoCollectOriginController { /** * 异常处理 + * * @param collectOrderRequest * @return */ diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java index 806ed380b..b76faf883 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java @@ -41,5 +41,6 @@ public class FilterThrOrderRequest extends ListPageRequest { * 来源业务 */ private String fromType; + private String busType; private List erpOrderResponses; } diff --git a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java index bb920c1c4..6f7934ed0 100644 --- a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java +++ b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java @@ -23,23 +23,24 @@ public class DownloadFactory { /** * 第三方单据类型 + * * @param collectOrderRequest * @return */ - public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest){ + public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) { String busType = collectOrderRequest.getBusType(); - if(busType == null){ + if (busType == null) { return ResultVOUtils.error("下载失败，未配置业务类型"); } - if(busType.equals(BusTypeConstant.YPCF002.getBusType())){ + if (busType.equals(BusTypeConstant.YPCF002.getBusType())) { return ypcf002Download.downloadOrder(collectOrderRequest); - } else if(busType.equals(BusTypeConstant.CGJH001.getBusType())){ + } else if (busType.equals(BusTypeConstant.CGJH001.getBusType())) { return thrOrderDownload.downloadOrder(collectOrderRequest); - } else if(busType.equals(BusTypeConstant.LYRK.getBusType())){ + } else if (busType.equals(BusTypeConstant.LYRK.getBusType())) { return thrOrderDownload.downloadOrder(collectOrderRequest); - } else if(busType.equals(BusTypeConstant.GMRK.getBusType())){ + } else if (busType.equals(BusTypeConstant.GMRK.getBusType())) { return thrOrderDownload.downloadOrder(collectOrderRequest); - } else if(busType.equals(BusTypeConstant.LYCK.getBusType())){ + } else if (busType.equals(BusTypeConstant.LYCK.getBusType())) { return thrOrderDownload.downloadOrder(collectOrderRequest); } return ResultVOUtils.error("下载失败，未配置业务类型"); diff --git a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java index 2e04f8307..2ec727114 100644 --- a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java +++ b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java @@ -32,7 +32,7 @@ import java.util.List; * 出入信息 LYRK GMRK LYCK */ @Service -public class ThrOrderDownload implements IDownload{ +public class ThrOrderDownload implements IDownload { @Resource private ErpBasicClient erpBasicClient; @Resource @@ -45,23 +45,24 @@ public class ThrOrderDownload implements IDownload{ @Override public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) { LambdaQueryWrapper w = new LambdaQueryWrapper<>(); - w.eq(StrUtil.isNotBlank(collectOrderRequest.getBillNo()),ThrOrderEntity::getBillNo,collectOrderRequest.getBillNo()); + w.eq(StrUtil.isNotBlank(collectOrderRequest.getBillNo()), ThrOrderEntity::getBillNo, collectOrderRequest.getBillNo()); List thrOrderEntities = thrOrderDao.selectList(w); - if(CollUtil.isNotEmpty(thrOrderEntities)){ - return this.importThrOrder(thrOrderEntities,collectOrderRequest); - }else{ + if (CollUtil.isNotEmpty(thrOrderEntities)) { + return this.importThrOrder(thrOrderEntities, collectOrderRequest); + } else { //三方拉取 FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); filterThrOrderRequest.setPage(1); filterThrOrderRequest.setLimit(100); filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo()); filterThrOrderRequest.setThirdSys("thirdId"); + filterThrOrderRequest.setBusType(collectOrderRequest.getBusType()); filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); filterThrOrderRequest.setFromType(collectOrderRequest.getFromType()); BaseResponse> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest); if (baseResponse.getCode() == 20000) { List list = baseResponse.getData().getList(); - if(CollUtil.isNotEmpty(list)){ + if (CollUtil.isNotEmpty(list)) { list.forEach(item -> { ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); BeanUtil.copyProperties(item, thrOrderEntity); @@ -80,7 +81,7 @@ public class ThrOrderDownload implements IDownload{ }); //再次获取 thrOrderEntities = thrOrderDao.selectList(w); - return this.importThrOrder(thrOrderEntities,collectOrderRequest); + return this.importThrOrder(thrOrderEntities, collectOrderRequest); } } } @@ -90,13 +91,14 @@ public class ThrOrderDownload implements IDownload{ /** * 下载至单据 + * * @param thrOrderEntities * @param collectOrderRequest */ - private BaseResponse importThrOrder(List thrOrderEntities,CollectOrderRequest collectOrderRequest){ + private BaseResponse importThrOrder(List thrOrderEntities, CollectOrderRequest collectOrderRequest) { List ioCollectOrderList = new ArrayList<>(); - if(CollUtil.isNotEmpty(thrOrderEntities)){ - for(ThrOrderEntity thrOrder: thrOrderEntities){ + if (CollUtil.isNotEmpty(thrOrderEntities)) { + for (ThrOrderEntity thrOrder : thrOrderEntities) { IoCollectOrder ioCollectOrder = new IoCollectOrder(); StringBuilder errorMsg = new StringBuilder(); ioCollectOrder.setBillNo(thrOrder.getBillNo()); @@ -111,9 +113,9 @@ public class ThrOrderDownload implements IDownload{ ioCollectOrder.setUpdateTime(new Date()); ioCollectOrder.setSplitStatus(0); ioCollectOrder.setTagStatus(0); - List thrOrderDetailEntities = thrOrderDetailDao.selectList(new LambdaQueryWrapper().eq(ThrOrderDetailEntity::getOrderIdFk,thrOrder.getBillNo())); + List thrOrderDetailEntities = thrOrderDetailDao.selectList(new LambdaQueryWrapper().eq(ThrOrderDetailEntity::getOrderIdFk, thrOrder.getBillNo())); List bizList = new ArrayList<>(); - for(ThrOrderDetailEntity entity : thrOrderDetailEntities){ + for (ThrOrderDetailEntity entity : thrOrderDetailEntities) { IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); // BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE())); // if (basicUdirelEntity != null) { @@ -139,8 +141,8 @@ public class ThrOrderDownload implements IDownload{ ioCollectOrder.setBizList(bizList); ioCollectOrderList.add(ioCollectOrder); } - collectOrderService.importPrescribe(ioCollectOrderList,collectOrderRequest.getBusType()); - return ResultVOUtils.success("下载成功"); + collectOrderService.importPrescribe(ioCollectOrderList, collectOrderRequest.getBusType()); + return ResultVOUtils.success("下载成功"); } return ResultVOUtils.error("下载失败"); }