From 4ff0db068d035e36679c41780e867821ce48ea05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 30 Aug 2024 15:51:40 +0800 Subject: [PATCH] =?UTF-8?q?feature:=E8=AE=A2=E5=8D=95=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=A2=E5=8D=95=E5=90=8C=E6=97=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=AD=E9=97=B4=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/bespoke/service/OrderHandleService.java | 2 ++ .../modules/bespoke/service/OrderService.java | 1 + .../bespoke/service/impl/OrderHandleServiceImpl.java | 6 ++++++ .../bespoke/service/impl/SkOrderServiceImpl.java | 12 ++++++++++++ .../bespoke/service/impl/YyOrderServiceImpl.java | 12 ++++++++++++ .../order/controller/OrderInvoiceController.java | 11 +++++++++++ 6 files changed, 44 insertions(+) diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderHandleService.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderHandleService.java index 520a468..4f02278 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderHandleService.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderHandleService.java @@ -66,4 +66,6 @@ public interface OrderHandleService { R backMsg(String msg); boolean test(); + + int delOrderByDdh(ReqParam reqParam); } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderService.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderService.java index f1e7020..6d7c8ac 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderService.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderService.java @@ -25,4 +25,5 @@ public interface OrderService { //订单回传 R backMsg(OrderInvoiceInfo orderInvoiceInfo,List orderOriginExtendInfos, FileModel fileModel,String ddh); + int delOrderByDdh(ReqParam reqParam); } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java index 7faf009..1292b92 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java @@ -432,6 +432,12 @@ public class OrderHandleServiceImpl implements OrderHandleService { return flag; } + @Override + public int delOrderByDdh(ReqParam reqParam) { + OrderService orderService = SpringUtil.getBean(serviceConfig.getService(reqParam.getNsrsbh()), OrderService.class); + return orderService.delOrderByDdh(reqParam); + } + private void updatePushErrorMsgToDb(String fpqqlsh, String errorMessage, List shList) { if (StringUtils.isNotBlank(fpqqlsh) && CollUtil.isNotEmpty(shList)) { OrderInvoiceInfo orderQuery = new OrderInvoiceInfo(); diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java index dde8dea..05dac11 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java @@ -257,6 +257,18 @@ public class SkOrderServiceImpl implements OrderService { return R.ok(); } + @Override + public int delOrderByDdh(ReqParam reqParam) { + List skOrderInfoList = skOrderInfoMapper.queryList(reqParam); + if (CollectionUtils.isNotEmpty(skOrderInfoList)){ + reqParam.setIds(Arrays.asList(skOrderInfoList.get(0).getId())); + int count = skOrderInfoMapper.delOrder(reqParam); + skOrderItemInfoMapper.delOrder(reqParam.getIds()); + return count; + } + return ConfigureConstant.INT_0; + } + @Transactional public int saveOrder(SkOrderInfo skOrderInfo, List skOrderItemInfoList, ReqParam reqParam) { diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java index dc10fe0..106b606 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java @@ -258,6 +258,18 @@ public class YyOrderServiceImpl implements OrderService { return R.error("回传失败"); } + @Override + public int delOrderByDdh(ReqParam reqParam) { + List yyOrderInfoList = yyOrderInfoMapper.queryList(reqParam); + if (CollectionUtils.isNotEmpty(yyOrderInfoList)){ + reqParam.setIds(Arrays.asList(yyOrderInfoList.get(0).getId())); + int count = yyOrderInfoMapper.delOrder(reqParam); + yyOrderItemInfoMapper.delOrder(reqParam.getIds()); + return count; + } + return ConfigureConstant.INT_0; + } + public int accressReback(List newTableList, String nsrsbh, String fphm) { int count = ConfigureConstant.INT_0; diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java index c4e3c16..fbba7ea 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java @@ -18,6 +18,8 @@ import com.dxhy.order.baseservice.constant.OrderValidateEnum; import com.dxhy.order.baseservice.model.OrderInvoiceInfo; import com.dxhy.order.baseservice.utils.OrderCommonUtils; import com.dxhy.order.consumer.model.page.PageRequestVO; +import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam; +import com.dxhy.order.consumer.modules.bespoke.service.OrderHandleService; import com.dxhy.order.consumer.modules.manager.service.InvoiceService; import com.dxhy.order.consumer.modules.order.model.PageInvoiceReq; import com.dxhy.order.consumer.modules.order.model.PageOrderReq; @@ -74,6 +76,9 @@ public class OrderInvoiceController { @Resource private SpecialInvoiceReversalService specialInvoiceReversalService; + @Resource + private OrderHandleService orderHandleService; + /** * 异常订单直接开票接口 @@ -378,6 +383,12 @@ public class OrderInvoiceController { if (success < 0) { errorMsgList.append(preStr).append("数据删除失败").append("\r\n"); continue; + }else { + ReqParam reqParam = new ReqParam(); + reqParam.setNsrsbh(nsrsbh); + reqParam.setEntId(orderProcessInfo.getEntId()); + reqParam.setDdh(orderProcessInfo.getDdh()); + orderHandleService.delOrderByDdh(reqParam); } //如果是红票数据,并且是专票,需要更新红字信息表数据 // 红字专票 作废后修改申请单的状态为未开票