From 0e441c3bda9c86ec3e71f4657320df214d30a704 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 4 Nov 2024 15:24:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A0=81=E6=98=8E=E7=BB=86=E5=88=B0?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=90=8C=E6=AD=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/collect/IoCollectOrderBackup.java | 3 ++ .../com/glxp/api/http/ErpBasicClient.java | 30 +++++++++++++++++-- .../req/collect/PostCollectOrderRequest.java | 1 + .../collect/IoCollectOrderBackupService.java | 21 +++++++++++-- 4 files changed, 51 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java index d4a4e1ebf..2624f5754 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java @@ -227,6 +227,9 @@ public class IoCollectOrderBackup implements Serializable { @TableField(exist = false) private List bizList; + @TableField(exist = false) + private List codeList; + /** * 异常信息 */ diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index 4f4c2d7e2..c50e046ac 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -427,7 +427,10 @@ public class ErpBasicClient { * 医保耗材详情 */ public BaseResponse> getYbHcflDetail(YbHcflDetailFilterRequest ybHcflDetailFilterRequest) { - String url = "https://www.udims.com/UDI_DL_Server_test" + "/udchs/ybHcfl/list"; +// String url = "https://www.udims.com/UDI_DL_Server_test" + "/udchs/ybHcfl/list"; + ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId("thirdId"); + String url = basicThirdSysEntity.getThridUrl() + "/udchs/ybHcfl/list"; + try { ybHcflDetailFilterRequest.setLimit(1); ybHcflDetailFilterRequest.setPage(1); @@ -449,7 +452,9 @@ public class ErpBasicClient { * 医保药品详情 */ public BaseResponse> getYbDrugDetail(YbDrugDetailFilterRequest ybHcflDetailFilterRequest) { - String url = "https://www.udims.com/UDI_DL_Server_test" + "/udchs/ybDrug/list"; +// String url = "https://www.udims.com/UDI_DL_Server_test" + "/udchs/ybDrug/list"; + ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId("thirdId"); + String url = basicThirdSysEntity.getThridUrl() + "/udchs/ybDrug/list"; try { String response = httpOkClient.uCloudPost(url, ybHcflDetailFilterRequest); BaseResponse> listBaseResponse = @@ -461,4 +466,25 @@ public class ErpBasicClient { return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); } } + + + /** + * 上传已成功传输医保的完成单据 + */ + public BaseResponse collectOrderUpload(PostCollectOrderRequest postCollectOrderRequest) { + ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(postCollectOrderRequest.getThirdSys()); + String url = basicThirdSysEntity.getThridUrl() + "/busOrderApi/sps/sync/collect/order/upload"; + + try { + String response = httpOkClient.uCloudPost(url, postCollectOrderRequest); + BaseResponse listBaseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return listBaseResponse; + } catch (Exception e) { + log.error("上传已成功传输医保的完成单据", e); + return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); + } + } + } diff --git a/src/main/java/com/glxp/api/req/collect/PostCollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/PostCollectOrderRequest.java index 43fc772b3..d60f6ad57 100644 --- a/src/main/java/com/glxp/api/req/collect/PostCollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/PostCollectOrderRequest.java @@ -11,6 +11,7 @@ public class PostCollectOrderRequest { private String thirdSys; + private String webTitle; List collectOrderList; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index 403714ffa..614d47222 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -13,6 +13,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.controller.collect.IoCollectCodeBackupController; import com.glxp.api.dao.collect.IoCollectOrderBackupMapper; import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.auth.AuthAdmin; @@ -42,6 +43,7 @@ import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.util.*; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -94,8 +96,11 @@ public class IoCollectOrderBackupService extends ServiceImpl filterList(CollectOrderRequest collectOrderRequest) { if (collectOrderRequest == null) { @@ -224,17 +229,29 @@ public class IoCollectOrderBackupService extends ServiceImpl collectOrderBizResponses = combieOrderDetail(collectOrderBizRequest); collectOrder.setCollectOrderBizResponseList(collectOrderBizResponses); + List list = ioCollectCodeBackService.list(new LambdaQueryWrapper().eq(IoCollectCodeBackup::getBillNo, collectOrder.getBillNo())); + collectOrder.setCodeList(list); List collectOrderList = new ArrayList<>(); collectOrderList.add(collectOrder); orderRequest.setCollectOrderList(collectOrderList); BaseResponse baseResponse = erpBasicClient.postOrder(orderRequest); log.debug("单据返回=========" + baseResponse); if (baseResponse.getCode() == 20000) { - // + // 触发上传 转发至中继服务 到外网 再到国家同步库 + ThreadUtil.execAsync(() -> { + BaseResponse stringBaseResponse = new BaseResponse<>(); + try { + stringBaseResponse = erpBasicClient.collectOrderUpload(orderRequest); + }catch (Exception e){ + throw new JsonException("触发上传 转发至中继服务 到外网 再到国家同步库 接口服务出错：" + stringBaseResponse.getMessage()); + } + }); + } else { throw new JsonException("连接第三方系统接口服务出错，" + baseResponse.getMessage()); }