diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 57184e587..1c62aebda 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -513,7 +513,7 @@ public class IoCollectOrderService extends ServiceImpl().eq(IoCollectOrder::getBillNo,billNo)); - collectOrderBizService.remove(new LambdaUpdateWrapper().eq(IoCollectOrderBiz::getOrderIdFk,billNo)); + this.remove(new LambdaUpdateWrapper().eq(IoCollectOrder::getBillNo, billNo)); + collectOrderBizService.remove(new LambdaUpdateWrapper().eq(IoCollectOrderBiz::getOrderIdFk, billNo)); } 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 dbe4ac45d..29853767a 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 @@ -82,7 +82,7 @@ public class ThrOrderDownload implements IDownload { * @param thrOrderEntities * @param collectOrderRequest */ - private BaseResponse importThrOrder(List thrOrderEntities, CollectOrderRequest collectOrderRequest) { + public BaseResponse importThrOrder(List thrOrderEntities, CollectOrderRequest collectOrderRequest) { List ioCollectOrderList = new ArrayList<>(); if (CollUtil.isNotEmpty(thrOrderEntities)) { for (IoCollectOrder thrOrder : thrOrderEntities) { @@ -116,15 +116,12 @@ public class ThrOrderDownload implements IDownload { bizList.add(collectOrderBiz); } if (StrUtil.isNotBlank(errorMsg)) { - ioCollectOrder.setErrorMsg(errorMsg.toString()); ioCollectOrder.setTagStatus(4); } + ioCollectOrder.setErrorMsg(errorMsg.toString()); ioCollectOrder.setBizList(bizList); ioCollectOrderList.add(ioCollectOrder); } - - - collectOrderService.importPrescribe(ioCollectOrderList, collectOrderRequest.getBusType()); return ResultVOUtils.success("下载成功"); } diff --git a/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java b/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java index ae55a042f..a56d42c84 100644 --- a/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java +++ b/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java @@ -20,6 +20,8 @@ public class YPCF002Download implements IDownload { private ErpBasicClient erpBasicClient; @Resource private IoCollectOrderService collectOrderService; + @Resource + ThrOrderDownload thrOrderDownload; @Override public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) { @@ -37,12 +39,11 @@ public class YPCF002Download implements IDownload { getSickPrescribeRequest.setPage(page); BaseResponse> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest); - // TODO: 2024/9/11 添加一张中间表(io_collect_order_origin)原始表做为转换 if (baseResponse.getCode() == 20000) { List list = baseResponse.getData().getList(); - collectOrderService.importPrescribe(list, collectOrderRequest.getBusType()); + thrOrderDownload.importThrOrder(list, collectOrderRequest); if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) { page++; } else {