From 3eddd3676a57c1cc52d48abfbf115e52927be84b Mon Sep 17 00:00:00 2001 From: qiuyt Date: Wed, 18 Dec 2024 16:30:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=20?= =?UTF-8?q?=E5=8C=BB=E4=BF=9D=E4=B8=8A=E4=BC=A0=E5=8D=95=E6=8D=AE=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E8=B0=83=E7=94=A8=E6=9F=A5=E8=AF=A2=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderReviewController.java | 101 +++++++++++-- .../AlihealthYljgUploadinoutbillReqeust.java | 9 +- .../AlihealthYljgSinglerelationResponse.java | 141 ++++++++++++++++++ .../service/collect/RelCodeBatchService.java | 30 ++++ .../util/alihealth/AlihealthYljgUtils.java | 74 +++++++-- 5 files changed, 325 insertions(+), 30 deletions(-) create mode 100644 src/main/java/com/glxp/api/res/alihealth/AlihealthYljgSinglerelationResponse.java diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 2b89a76f..8e6536dc 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -2,7 +2,10 @@ package com.glxp.api.controller.inout; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -14,29 +17,44 @@ import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.controller.BaseController; +import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.CustomerInfoEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.EntrustReceEntity; +import com.glxp.api.entity.collect.RelCodeBatch; +import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.system.SystemParamConfigEntity; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.alihealth.AlihealthYljgSinglerelationReqeust; +import com.glxp.api.req.alihealth.AlihealthYljgUploadinoutbillReqeust; +import com.glxp.api.req.alihealth.local.AlihealthRelCodeInsertReqeust; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; import com.glxp.api.req.inout.ReviewFinishRequest; import com.glxp.api.req.inout.ReviewSpmsRequest; import com.glxp.api.req.inout.UpdateExportStatusRequest; import com.glxp.api.req.sync.SpsSyncDataRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.alihealth.AlihealthKytSinglerelationResponse; +import com.glxp.api.res.alihealth.AlihealthYljgSinglerelationResponse; import com.glxp.api.res.inout.AcceptOrderResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.sync.SpsSyncOrderResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.service.basic.impl.BasicBussinessTypeServiceImpl; +import com.glxp.api.service.basic.impl.EntrustReceServiceImpl; +import com.glxp.api.service.collect.RelCodeBatchService; +import com.glxp.api.service.collect.RelCodeDetailService; import com.glxp.api.service.inout.*; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoCodeTempService; import com.glxp.api.service.sync.SpsSyncDownloadService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.*; +import com.glxp.api.util.alihealth.AlihealthYljgUtils; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.BindingResult; @@ -46,10 +64,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Locale; +import java.util.*; +import java.util.stream.Collectors; //单据验收 @Slf4j @@ -111,7 +127,16 @@ public class IoOrderReviewController extends BaseController { } - + @Resource + private AlihealthYljgUtils alihealthYljgUtils; + @Resource + private IoCodeService ioCodeService; + @Resource + private RelCodeBatchService relCodeBatchService; + @Resource + private RelCodeDetailService relCodeDetailService; + @Resource + private IoCodeTempDao ioCodeTempDao; //前端二次审核 @AuthRuleAnnotation("") @PostMapping("/spms/inout/order/web/updateStatus") @@ -127,7 +152,16 @@ public class IoOrderReviewController extends BaseController { return ResultVOUtils.error(500, "未找到该业务单据"); } if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) { - return updateReview(getUser(), orderEntity); + BaseResponse baseResponse = updateReview(getUser(), orderEntity); + if(baseResponse.getCode() == 20000) { + //todo 审核通过上传关联关系 + BasicBussinessTypeEntity businessType = basicBussinessTypeService.findByAction(orderEntity.getAction()); + if (businessType.getCorpType() == ConstantStatus.CORP_SP && businessType.getMainAction().equals(ConstantType.TYPE_PUT) && businessType.getProductType() == 2) { + aliBillsDispose(orderEntity); + } + } + return baseResponse; + } else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) { return thirdUpdateReview(getUser(), orderEntity); } else { @@ -135,13 +169,8 @@ public class IoOrderReviewController extends BaseController { } - //todo 审核通过上传关联关系 - BasicBussinessTypeEntity businessType = basicBussinessTypeService.findByAction(orderEntity.getAction()); - if (businessType.getCorpType() == ConstantStatus.CORP_SP && businessType.getMainAction().equals(ConstantType.TYPE_PUT) && businessType.getProductType() == 2) { - //1.上传入库单 - //2.下载关联关系存到关联关系表 - } + } @@ -274,6 +303,7 @@ public class IoOrderReviewController extends BaseController { @Resource IBasicBussinessTypeService basicBussinessTypeService; + @Resource GennerOrderUtils gennerOrderUtils; @Resource @@ -438,7 +468,54 @@ public class IoOrderReviewController extends BaseController { ioCheckInoutService.checkThird(orderEntity); return ResultVOUtils.success("更新成功"); } + // 异步处理阿里单据 + public BaseResponse aliBillsDispose( IoOrderEntity orderEntity) { + ThreadUtil.execAsync(() -> { + //1.上传入库单 + AlihealthYljgUploadinoutbillReqeust alihealthYljgUploadinoutbillReqeust = new AlihealthYljgUploadinoutbillReqeust(); + alihealthYljgUploadinoutbillReqeust.setBill_code(orderEntity.getBillNo()); + alihealthYljgUploadinoutbillReqeust.setBill_time(DateUtil.formatDateTime(orderEntity.getAuditTime())); + alihealthYljgUploadinoutbillReqeust.setBill_type(102); + // 先写死 到时候以阿里的为准 + alihealthYljgUploadinoutbillReqeust.setPhysic_type(3); + alihealthYljgUploadinoutbillReqeust.setClient_type("2"); + // 查询改单据传的码 + List ioCodeEntityList = ioCodeTempDao.selectList(new QueryWrapper().eq("orderId", orderEntity.getBillNo())); + if(ioCodeEntityList!=null && ioCodeEntityList.size() >0){ + List codeList = new ArrayList<>(); + for (IoCodeTempEntity ioCodeEntity : ioCodeEntityList) { + codeList.add(ioCodeEntity.getCode()); + } + alihealthYljgUploadinoutbillReqeust.setTrace_codes( String.join(",", codeList)); + BaseResponse baseResponseUploadinoutbill = alihealthYljgUtils.yljgUploadinoutbill(alihealthYljgUploadinoutbillReqeust,orderEntity.getFromCorp()); + if(baseResponseUploadinoutbill.getCode() == 20000){ + try { + Thread.sleep(1000); + for (IoCodeTempEntity ioCodeEntity : ioCodeEntityList) { + AlihealthYljgSinglerelationReqeust alihealthYljgSinglerelationReqeust = new AlihealthYljgSinglerelationReqeust(); + alihealthYljgSinglerelationReqeust.setCode(ioCodeEntity.getCode()); + BaseResponse baseResponse = alihealthYljgUtils.relCodeInsert(alihealthYljgSinglerelationReqeust); + if (baseResponse.getCode() == 20000) { + relCodeBatchService.addRelCodeAli(baseResponse, orderEntity.getFromCorp()); + } else { + log.error("阿里调用码关联关系失败==="+baseResponse.getMessage()); + } + } + } catch (InterruptedException e) { + } + //2.下载关联关系存到关联关系表 + + }else { + log.error("阿里调用上传单据失败==="+baseResponseUploadinoutbill.getMessage()); + + } + + } + }); + + return ResultVOUtils.success("更新成功"); + } @Resource SpsSyncDownloadService spsSyncDownloadService; diff --git a/src/main/java/com/glxp/api/req/alihealth/AlihealthYljgUploadinoutbillReqeust.java b/src/main/java/com/glxp/api/req/alihealth/AlihealthYljgUploadinoutbillReqeust.java index a6601029..d4eaf3c0 100644 --- a/src/main/java/com/glxp/api/req/alihealth/AlihealthYljgUploadinoutbillReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/AlihealthYljgUploadinoutbillReqeust.java @@ -1,14 +1,17 @@ package com.glxp.api.req.alihealth; import com.glxp.api.req.alihealth.AlihealthKytCommonParametersReqeust; +import io.swagger.models.auth.In; import lombok.Data; +import java.util.Date; + @Data public class AlihealthYljgUploadinoutbillReqeust extends AlihealthKytCommonParametersReqeust { private String bill_code; private String bill_time; - private String bill_type; - private String physic_type; + private Integer bill_type; + private Integer physic_type; private String ref_user_id; private String agent_ref_user_id; private String from_user_id; @@ -36,7 +39,7 @@ public class AlihealthYljgUploadinoutbillReqeust extends AlihealthKytCommonParam private String to_person; private String dis_ref_ent_id; private String dis_ent_id; - private String qu_receivable; + private Integer qu_receivable; private String xt_is_check; private String xt_check_code; private String xt_check_code_desc; diff --git a/src/main/java/com/glxp/api/res/alihealth/AlihealthYljgSinglerelationResponse.java b/src/main/java/com/glxp/api/res/alihealth/AlihealthYljgSinglerelationResponse.java new file mode 100644 index 00000000..716a3d25 --- /dev/null +++ b/src/main/java/com/glxp/api/res/alihealth/AlihealthYljgSinglerelationResponse.java @@ -0,0 +1,141 @@ +package com.glxp.api.res.alihealth; + +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.glxp.api.entity.collect.RelCodeBatch; +import com.glxp.api.entity.collect.RelCodeDetail; +import com.glxp.api.util.udi.FilterUdiUtils; +import lombok.Data; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; + +import java.util.*; + +@Data +public class AlihealthYljgSinglerelationResponse extends AlihealthKytCommonParametersResponse{ + private JSONObject base_infos_dto; + private String code; + private JSONObject code_active_info_dto; + private JSONObject code_relation_list; + private String is_smallest; + private JSONObject pkg_info_dto; + private JSONObject produce_info_list; + + private String refEntId; + + public AlihealthYljgSinglerelationResponse(String json) { + // 初始化请求的值 + JSONObject jsonObject = JSONUtil.parseObj(json); + JSONObject jsonObjectResult = null; + for (String s : jsonObject.keySet()) { + jsonObjectResult = jsonObject.getJSONObject(s).getJSONObject("result"); + + } + AlihealthKytCommonParametersResponse alihealthKytCommonParametersResponse = JSONUtil.toBean(jsonObjectResult.toString(), + AlihealthKytCommonParametersResponse.class); + BeanUtils.copyProperties(alihealthKytCommonParametersResponse,this); + if(StringUtils.isNotEmpty(this.getMsg_info()) + && this.getMsg_info().equals("调用成功") + ){ + this.disposeResult(jsonObjectResult); + } + + } + public void disposeResult(JSONObject jsonObjectResult){ + JSONArray jsonArray = jsonObjectResult.getJSONObject("model_list").getJSONArray("code_relation_dto"); + JSONObject codeRelationDto = (JSONObject) jsonArray.get(0); + if (!Objects.isNull(codeRelationDto)) { + this.setBase_infos_dto(codeRelationDto.getJSONObject("base_infos_dto")); + this.setCode(codeRelationDto.getStr("code")); + this.setCode_active_info_dto(codeRelationDto.getJSONObject("code_active_info_dto")); + this.setCode_relation_list(codeRelationDto.getJSONObject("code_relation_list")); + this.setIs_smallest(codeRelationDto.getStr("is_smallest")); + this.setPkg_info_dto(codeRelationDto.getJSONObject("pkg_info_dto")); + this.setProduce_info_list(codeRelationDto.getJSONObject("produce_info_list")); + } + } + public RelCodeBatch disposeRelCodeBatch(String customerId){ + JSONArray jsonArrayBaseInfoDto = this.getBase_infos_dto().getJSONObject("base_info_list").getJSONArray("base_info_dto"); + JSONObject jsonObject = (JSONObject) jsonArrayBaseInfoDto.get(0); + RelCodeBatch relCodeBatch = new RelCodeBatch(); + List> jsonArray = (List) this.getCode_relation_list().get("code_info"); + Integer oneLevelCount = 0; + Integer twoLevelCount = 0; + Integer threeLevelCount = 0; + String parentCode = null; + if (jsonArray != null && jsonArray.size() > 0) { + parentCode = jsonArray.get(0).get("parent_code"); + relCodeBatch.setCurCode(parentCode); + + for (Map map : jsonArray) { + switch (map.get("code_level")) { + case "1": + oneLevelCount++; + break; + case "2": + twoLevelCount++; + break; + case "3": + threeLevelCount++; + break; + } + } + } +// relCodeBatch.setId(); + relCodeBatch.setProductCode(FilterUdiUtils.getUdi(parentCode).getUdi()); + relCodeBatch.setSubTypeNo(this.getCode_active_info_dto().getStr("relation_type")); + relCodeBatch.setCascadeRatio(jsonObject.getStr("pkg_ratio")); + relCodeBatch.setPackageSpec(jsonObject.getStr("pkg_spec")); +// relCodeBatch.setComment(); + relCodeBatch.setBatchNo(jsonObject.getStr("produce_batch_no")); + relCodeBatch.setMadeDate(jsonObject.getStr("produce_date")); + relCodeBatch.setValidateDate(jsonObject.getStr("exprie_date")); + relCodeBatch.setWorkShop(jsonObject.getStr("exprie_date")); +// relCodeBatch.setLineName(); + relCodeBatch.setLineManager(jsonObject.getStr("oper_ic_name")); +// relCodeBatch.setCreateTime(); +// relCodeBatch.setCreateUser(); + relCodeBatch.setUpdateTime(new Date()); + relCodeBatch.setUpdateUser(customerId); + relCodeBatch.setUploadFlagUp(0); + relCodeBatch.setUploadFlagDown(0); + relCodeBatch.setParentCode(null); + relCodeBatch.setErpId(customerId); + + relCodeBatch.setOneLevelCount(oneLevelCount); + relCodeBatch.setTwoLevelCount(twoLevelCount); + relCodeBatch.setThreeLevelCount(threeLevelCount); + + return relCodeBatch; + } + + + public List disposeRelRodeDetailList(Integer batchIdFk) { + List list = new ArrayList<>(); + List> jsonArray = (List) this.getCode_relation_list().get("code_info"); + if (jsonArray != null && jsonArray.size() > 0) { + for (Map map : jsonArray) { + if (!Objects.isNull(map)) { + RelCodeDetail relCodeDetail = new RelCodeDetail(); + relCodeDetail.setCurCode(map.get("code")); + relCodeDetail.setPackLayer(Integer.valueOf(map.get("code_level"))); + relCodeDetail.setParentCode(map.get("parent_code")); + Integer flag = null; + switch (map.get("status")) { + case "I": + flag = 1; + break; + case "O": + flag = 0; + break; + } + relCodeDetail.setFlag(flag); + relCodeDetail.setBatchIdFk(batchIdFk); + list.add(relCodeDetail); + } + } + } + return list; + } +} diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index cded78d6..6089cbcb 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -35,6 +35,7 @@ import com.glxp.api.req.alihealth.local.AlihealthYljgLocaCodedetailReqeust; import com.glxp.api.req.collect.RelCodeBatchRequest; import com.glxp.api.req.collect.RelCodeDetailRequest; import com.glxp.api.res.alihealth.AlihealthKytSinglerelationResponse; +import com.glxp.api.res.alihealth.AlihealthYljgSinglerelationResponse; import com.glxp.api.res.collect.RelCodeBatchResponse; import com.glxp.api.res.collect.RelCodeDetailByParentCodeResponse; import com.glxp.api.service.auth.CustomerInfoService; @@ -697,4 +698,33 @@ public class RelCodeBatchService extends ServiceImpl baseResponse, String erpId){ + AlihealthYljgSinglerelationResponse alihealthKytSinglerelationResponse = baseResponse.getData(); + // 返回的码关联关系进行插入 + RelCodeBatch relCodeBatch = alihealthKytSinglerelationResponse.disposeRelCodeBatch(erpId); + RelCodeBatch relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("productCode", relCodeBatch.getProductCode()) + .last("limit 1") + ); + if (Objects.isNull(relCodeBatchOne)) { + relCodeBatch.setCreateUser(erpId); + relCodeBatch.setCreateTime(new Date()); + relCodeBatchService.save(relCodeBatch); + + } else { + relCodeBatchService.update(relCodeBatch, new QueryWrapper().eq("productCode", relCodeBatch.getProductCode())); + } + Integer id = Objects.isNull(relCodeBatch.getId()) ? relCodeBatchOne.getId() : relCodeBatch.getId(); + // 进行查询 + List list = alihealthKytSinglerelationResponse.disposeRelRodeDetailList(id); + if (list != null && list.size() > 0) { + List curCodeList = new ArrayList(); + for (RelCodeDetail relCodeDetail : list) { + curCodeList.add(relCodeDetail.getCurCode()); + } + relCodeDetailService.remove(new QueryWrapper().in("curCode", curCodeList)); + + relCodeDetailService.saveBatch(list); + } + } } 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 d79d2749..93824987 100644 --- a/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java +++ b/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java @@ -50,14 +50,52 @@ public class AlihealthYljgUtils { * @param reqeust * @return */ - public BaseResponse yljgUploadinoutbill(AlihealthYljgLocalUploadinoutbillReqeust reqeust) { + public BaseResponse yljgUploadinoutbill(AlihealthYljgUploadinoutbillReqeust reqeust,String erpId) { + AuthCompany authCompany = authCompanyMapper.selectOne( + new QueryWrapper().last("limit 1") + ); + reqeust.setApp_key(authCompany.getAppId()); + reqeust.setRef_user_id(authCompany.getRefEntId()); + reqeust.setTo_user_id(authCompany.getRefEntId()); AlihealthYljgUploadinoutbillResponse alihealthYljgUploadinoutbillResponse = null; + 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 (reqeust != null - && org.apache.commons.lang3.StringUtils.isNotEmpty(reqeust.getAppSecret()) - && org.apache.commons.lang3.StringUtils.isNotEmpty(reqeust.getAppSecret()) + && org.apache.commons.lang3.StringUtils.isNotEmpty(authCompany.getAppId()) + && org.apache.commons.lang3.StringUtils.isNotEmpty(authCompany.getAppSecret()) ) { try { - Map map = alihealthUtils.disposeSign(reqeust.getAlihealthYljgUploadinoutbillReqeust(), reqeust.getAppSecret()); + Map map = alihealthUtils.disposeSign(reqeust, authCompany.getAppSecret()); String json = HttpUtil.get(alihealthUrl, map); alihealthYljgUploadinoutbillResponse = JSONUtil.toBean(json, AlihealthYljgUploadinoutbillResponse.class); @@ -83,18 +121,25 @@ public class AlihealthYljgUtils { * @param reqeust * @return */ - public BaseResponse relCodeInsert(AlihealthRelCodeInsertYljgReqeust reqeust) { - AlihealthYljgListupoutDetailResponse alihealthYljgListupoutDetailResponse = null; - AlihealthYljgUploadinoutbillReqeust alihealthYljgUploadinoutbillReqeust = reqeust.getAlihealthYljgUploadinoutbillReqeust(); + public BaseResponse relCodeInsert(AlihealthYljgSinglerelationReqeust reqeust) { + + AuthCompany authCompany = authCompanyMapper.selectOne( + new QueryWrapper().last("limit 1") + ); + reqeust.setApp_key(authCompany.getAppId()); + reqeust.setRef_ent_id(authCompany.getRefEntId()); + reqeust.setDes_ref_ent_id(authCompany.getRefEntId()); + + AlihealthYljgSinglerelationResponse alihealthYljgSinglerelationResponse = null; if (reqeust != null - && org.apache.commons.lang3.StringUtils.isNotEmpty(alihealthYljgUploadinoutbillReqeust.getApp_key()) - && org.apache.commons.lang3.StringUtils.isNotEmpty(reqeust.getAppSecret()) + && org.apache.commons.lang3.StringUtils.isNotEmpty(authCompany.getAppId()) + && org.apache.commons.lang3.StringUtils.isNotEmpty(authCompany.getAppSecret()) ) { try { - Map map = alihealthUtils.disposeSign(alihealthYljgUploadinoutbillReqeust, reqeust.getAppSecret()); + Map map = alihealthUtils.disposeSign(reqeust, authCompany.getAppSecret()); String json = HttpUtil.get(alihealthUrl, map); - alihealthYljgListupoutDetailResponse = new AlihealthYljgListupoutDetailResponse(json); + alihealthYljgSinglerelationResponse = new AlihealthYljgSinglerelationResponse(json); } catch (Exception e) { return ResultVOUtils.error("阿里健康接口调用失败===" + e.getMessage()); @@ -103,11 +148,10 @@ public class AlihealthYljgUtils { } else { return ResultVOUtils.error("阿里健康接口调用失败===用户找不到或者key和秘钥为空"); } - if (alihealthYljgListupoutDetailResponse.judgeCall()) { - - return ResultVOUtils.success(alihealthYljgListupoutDetailResponse); + if (alihealthYljgSinglerelationResponse.judgeCall()) { + return ResultVOUtils.success(alihealthYljgSinglerelationResponse); } else { - return ResultVOUtils.error("阿里健康接口调用失败===" + alihealthYljgListupoutDetailResponse.getMsg_info()); + return ResultVOUtils.error("阿里健康接口调用失败===" + alihealthYljgSinglerelationResponse.getMsg_info()); }