From f518c41472f47e7d6adb5fe8bd1a6a4fde94bcac Mon Sep 17 00:00:00 2001 From: qiuyt Date: Fri, 13 Dec 2024 09:47:26 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=98=BF=E9=87=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=8A=A0=E4=B8=8A=E5=BE=80=E6=9D=A5=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/test/TestCodeController.java | 2 +- .../util/alihealth/AlihealthYljgUtils.java | 56 +++++++++++-------- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/test/TestCodeController.java b/src/main/java/com/glxp/api/controller/test/TestCodeController.java index e181cdd6..5f4c45e7 100644 --- a/src/main/java/com/glxp/api/controller/test/TestCodeController.java +++ b/src/main/java/com/glxp/api/controller/test/TestCodeController.java @@ -174,7 +174,7 @@ public class TestCodeController { alihealthYljgListupoutReqeust1.setEnd_date("2024-05-01"); alihealthYljgListupoutReqeust1.setPage(1); alihealthYljgListupoutReqeust1.setPage_size(20); - return alihealthYljgUtils.listupout(alihealthYljgListupoutReqeust1,"厦门同春医药股份有限公司"); + return alihealthYljgUtils.listupout(alihealthYljgListupoutReqeust1,"72890663819159"); } @PostMapping("/test4") public BaseResponse test4() { diff --git a/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java b/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java index a82b3c3c..b657fdaa 100644 --- a/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java +++ b/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java @@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.auth.AuthCompanyMapper; +import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.entity.alihealth.AliYljgBillDetail; import com.glxp.api.entity.alihealth.AliYljgSearchbill; import com.glxp.api.entity.auth.AuthCompany; +import com.glxp.api.entity.auth.CustomerInfoEntity; +import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.req.alihealth.*; import com.glxp.api.req.alihealth.local.*; @@ -38,6 +41,8 @@ public class AlihealthYljgUtils { private String alihealthUrl; @Resource private AuthCompanyMapper authCompanyMapper; + @Resource + private BasicCorpDao basicCorpDao; /** * 出入库单据上传 @@ -145,34 +150,41 @@ public class AlihealthYljgUtils { * @param reqeust * @return */ - public BaseResponse> listupout(AlihealthYljgListupoutReqeust reqeust,String erpName) { + public BaseResponse> listupout(AlihealthYljgListupoutReqeust reqeust,String erpId) { AuthCompany authCompany = authCompanyMapper.selectOne( new QueryWrapper().last("limit 1") ); - if(StringUtils.isNotEmpty(erpName)){ - AlihealthKytGetentinfoResponse alihealthKytGetentinfoResponse =null; - try { - AlihealthKytGetentinfoReqeust alihealthKytGetentinfoReqeust = new AlihealthKytGetentinfoReqeust(); - alihealthKytGetentinfoReqeust.setMethod("alibaba.alihealth.drugtrace.top.yljg.query.getentinfo"); - alihealthKytGetentinfoReqeust.setApp_key(authCompany.getAppId()); - alihealthKytGetentinfoReqeust.setEnt_name(erpName); - Map map = alihealthUtils.disposeSign(alihealthKytGetentinfoReqeust,authCompany.getAppSecret()); - String json = HttpUtil.get(alihealthUrl,map); - alihealthKytGetentinfoResponse =new AlihealthKytGetentinfoResponse(json); - - }catch (Exception e){ - return ResultVOUtils.error("阿里健康接口调用失败===往来单位名称请检查"); + if(StringUtils.isNotEmpty(erpId)){ + BasicCorpEntity basicCorpEntity = basicCorpDao.selectOne( + new QueryWrapper().eq("erpId",erpId) + ); + if(basicCorpEntity!=null){ + AlihealthKytGetentinfoResponse alihealthKytGetentinfoResponse =null; + try { + AlihealthKytGetentinfoReqeust alihealthKytGetentinfoReqeust = new AlihealthKytGetentinfoReqeust(); + alihealthKytGetentinfoReqeust.setMethod("alibaba.alihealth.drugtrace.top.yljg.query.getentinfo"); + alihealthKytGetentinfoReqeust.setApp_key(authCompany.getAppId()); + alihealthKytGetentinfoReqeust.setEnt_name(basicCorpEntity.getName()); + Map map = alihealthUtils.disposeSign(alihealthKytGetentinfoReqeust,authCompany.getAppSecret()); + String json = HttpUtil.get(alihealthUrl,map); + alihealthKytGetentinfoResponse =new AlihealthKytGetentinfoResponse(json); + + }catch (Exception e){ + return ResultVOUtils.error("阿里健康接口调用失败===往来单位名称请检查"); + + } + + if(StringUtils.isNotEmpty(alihealthKytGetentinfoResponse.getMsg_info()) + && alihealthKytGetentinfoResponse.getMsg_info().equals("调用成功") + ){ + reqeust.setFrom_user_id(alihealthKytGetentinfoResponse.getEnt_id()); + }else { + return ResultVOUtils.error("阿里健康接口调用失败===往来单位名称请检查==="+alihealthKytGetentinfoResponse.getMsg_info()); + + } } - if(StringUtils.isNotEmpty(alihealthKytGetentinfoResponse.getMsg_info()) - && alihealthKytGetentinfoResponse.getMsg_info().equals("调用成功") - ){ - reqeust.setFrom_user_id(alihealthKytGetentinfoResponse.getEnt_id()); - }else { - return ResultVOUtils.error("阿里健康接口调用失败===往来单位名称请检查==="+alihealthKytGetentinfoResponse.getMsg_info()); - - } }