From 5cf64403dfc0ec6648b567446d3afaa583c3d999 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 13 Dec 2024 09:27:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=98=BF=E9=87=8C=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8D=95=E7=9A=84=E4=B8=9A=E5=8A=A1=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alihealth/AlihealthBusController.java | 5 +- .../alihealth/AliYljgSearchbillReqeust.java | 3 +- .../impl/AlihealthBusServiceImpl.java | 69 ++++++++++--------- 3 files changed, 42 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java index 22d5363a..e03da11a 100644 --- a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java +++ b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java @@ -9,6 +9,7 @@ import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; import com.glxp.api.entity.alihealth.AliYljgBillDetail; import com.glxp.api.entity.alihealth.AliYljgBillDetailDrugCode; import com.glxp.api.entity.alihealth.AliYljgSearchbill; @@ -36,7 +37,7 @@ import java.util.Map; @Slf4j @RestController -public class AlihealthBusController { +public class AlihealthBusController extends BaseController { @Resource private AlihealthUtils alihealthUtils; @Value("${ALIHEALTH_URL:http://gw.api.taobao.com/router/rest}") @@ -158,6 +159,8 @@ public class AlihealthBusController { @PostMapping("/spms/alihealth/aliYljgSearchbillPage") @Log(title = "获取阿里药品的采购单", businessType = BusinessType.OTHER) public BaseResponse aliYljgSearchbillPage(@RequestBody AliYljgSearchbillReqeust aliYljgSearchbillReqeust) { + String customerId = getCustomerId(); + aliYljgSearchbillReqeust.setErpId(customerId); List list = alihealthBusService.aliYljgSearchbillPage(aliYljgSearchbillReqeust); PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); diff --git a/src/main/java/com/glxp/api/req/alihealth/AliYljgSearchbillReqeust.java b/src/main/java/com/glxp/api/req/alihealth/AliYljgSearchbillReqeust.java index f2335b7d..b9be471c 100644 --- a/src/main/java/com/glxp/api/req/alihealth/AliYljgSearchbillReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/AliYljgSearchbillReqeust.java @@ -130,6 +130,7 @@ public class AliYljgSearchbillReqeust extends ListPageRequest { @ApiModelProperty(value = "更新时间") private Date updateTime; - + private String beginDate; + private String ensDate; } diff --git a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java index adaa1163..40f3e0fe 100644 --- a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java +++ b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java @@ -1,14 +1,20 @@ package com.glxp.api.service.alihealth.impl; import com.github.pagehelper.PageHelper; +import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.alihealth.AliYljgBillDetail; import com.glxp.api.entity.alihealth.AliYljgBillDetailDrug; import com.glxp.api.entity.alihealth.AliYljgBillDetailDrugCode; import com.glxp.api.entity.alihealth.AliYljgSearchbill; +import com.glxp.api.exception.JsonException; import com.glxp.api.req.alihealth.AliYljgSearchbillReqeust; +import com.glxp.api.req.alihealth.AlihealthYljgListupoutDetailReqeust; +import com.glxp.api.req.alihealth.AlihealthYljgListupoutReqeust; import com.glxp.api.service.alihealth.AlihealthBusService; +import com.glxp.api.util.alihealth.AlihealthYljgUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -16,53 +22,50 @@ import java.util.List; @Service public class AlihealthBusServiceImpl implements AlihealthBusService { + @Resource + private AlihealthYljgUtils alihealthYljgUtils; @Override public List aliYljgSearchbillPage(AliYljgSearchbillReqeust aliYljgSearchbillReqeust) { if (aliYljgSearchbillReqeust == null) { return Collections.emptyList(); } + + AlihealthYljgListupoutReqeust alihealthYljgListupoutReqeust1 = new AlihealthYljgListupoutReqeust(); + alihealthYljgListupoutReqeust1.setBegin_date(aliYljgSearchbillReqeust.getBeginDate()); + alihealthYljgListupoutReqeust1.setEnd_date(aliYljgSearchbillReqeust.getEnsDate()); + if (aliYljgSearchbillReqeust.getPage() != null) { - int offset = (aliYljgSearchbillReqeust.getPage() - 1) * aliYljgSearchbillReqeust.getLimit(); - PageHelper.offsetPage(offset, aliYljgSearchbillReqeust.getLimit()); + alihealthYljgListupoutReqeust1.setPage(aliYljgSearchbillReqeust.getPage()); + alihealthYljgListupoutReqeust1.setPage_size(aliYljgSearchbillReqeust.getLimit()); + }else { + alihealthYljgListupoutReqeust1.setPage(1); + alihealthYljgListupoutReqeust1.setPage_size(20); + } + + BaseResponse> listBaseResponse = alihealthYljgUtils.listupout(alihealthYljgListupoutReqeust1, aliYljgSearchbillReqeust.getErpId()); + if (listBaseResponse.getCode() == 20000){ + List data = listBaseResponse.getData(); + return data; + }else { + throw new JsonException(listBaseResponse.getMessage()); } - // TODO: 2024/12/12 - List list = new ArrayList<>(); - AliYljgSearchbill aliYljgSearchbill1 = new AliYljgSearchbill(); - aliYljgSearchbill1.setBillCode("12121221"); - AliYljgSearchbill aliYljgSearchbill2 = new AliYljgSearchbill(); - aliYljgSearchbill2.setBillCode("34432432424"); - list.add(aliYljgSearchbill1); - list.add(aliYljgSearchbill2); - return list; } @Override public AliYljgBillDetail aliYljgBillDetail(AliYljgSearchbillReqeust aliYljgSearchbillReqeust) { - // TODO: 2024/12/12 + AlihealthYljgListupoutDetailReqeust alihealthYljgListupoutDetailReqeust = new AlihealthYljgListupoutDetailReqeust(); + alihealthYljgListupoutDetailReqeust.setBill_code(aliYljgSearchbillReqeust.getBillCode()); + alihealthYljgListupoutDetailReqeust.setFrom_ref_user_id(aliYljgSearchbillReqeust.getFromRefUserId()); - AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode1 = new AliYljgBillDetailDrugCode(); - AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode2 = new AliYljgBillDetailDrugCode(); - aliYljgBillDetailDrugCode1.setCode("112121111111d"); - aliYljgBillDetailDrugCode2.setCode("5342343242343242342"); - List aliYljgBillDetailDrugCodeList = new ArrayList<>(); - aliYljgBillDetailDrugCodeList.add(aliYljgBillDetailDrugCode1); - aliYljgBillDetailDrugCodeList.add(aliYljgBillDetailDrugCode2); - - AliYljgBillDetail aliYljgBillDetail = new AliYljgBillDetail(); - List aliYljgBillDetailDrugList = new ArrayList<>(); - AliYljgBillDetailDrug aliYljgBillDetailDrug1 = new AliYljgBillDetailDrug(); - aliYljgBillDetailDrug1.setProdName("dabhbuidiqwiduqbiudqib"); - aliYljgBillDetailDrug1.setAliYljgBillDetailDrugCodeList(aliYljgBillDetailDrugCodeList); - - AliYljgBillDetailDrug aliYljgBillDetailDrug2 = new AliYljgBillDetailDrug(); - aliYljgBillDetailDrug2.setProdName("dabhbuidiqwiduqbiudqib"); - aliYljgBillDetailDrug2.setAliYljgBillDetailDrugCodeList(aliYljgBillDetailDrugCodeList); - aliYljgBillDetailDrugList.add(aliYljgBillDetailDrug1); - aliYljgBillDetailDrugList.add(aliYljgBillDetailDrug2); + BaseResponse aliYljgBillDetailBaseResponse = alihealthYljgUtils.listupoutDetail(alihealthYljgListupoutDetailReqeust); + if (aliYljgBillDetailBaseResponse.getCode() == 20000){ + AliYljgBillDetail data = aliYljgBillDetailBaseResponse.getData(); + return data; + }else { + throw new JsonException(aliYljgBillDetailBaseResponse.getMessage()); + } - aliYljgBillDetail.setAliYljgBillDetailDrugList(aliYljgBillDetailDrugList); - return aliYljgBillDetail; } }