From daafe4a98d424a4c6b47ad7e601796ecd33352dc Mon Sep 17 00:00:00 2001 From: gongquanlin <1025081659@qq.com> Date: Mon, 27 Mar 2023 17:14:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=8A=A5=E8=B4=A6=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderInfoController.java | 2 + .../controller/OrderInvoiceController.java | 25 +++++++-- .../order/model/dto/RewriteBzdhDTO.java | 16 ++++++ .../order/service/OrderBzdhService.java | 8 +++ .../service/impl/OrderBzdhServiceImpl.java | 55 +++++++++++++++++++ 5 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/dto/RewriteBzdhDTO.java create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderBzdhService.java create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderBzdhServiceImpl.java diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java index 0629a2e5..41edf083 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java @@ -7,6 +7,8 @@ import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoContentEnum; import com.dxhy.order.constant.OrderInfoEnum; import com.dxhy.order.constant.OrderManagementConstant; +import com.dxhy.order.consumer.modules.order.model.dto.RewriteBzdhDTO; +import com.dxhy.order.consumer.modules.order.service.OrderBzdhService; import com.dxhy.order.exception.OrderReceiveException; import com.dxhy.order.model.*; import com.dxhy.order.model.page.OrderListQuery; diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java index 1a30eaef..59cc5662 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java @@ -7,6 +7,8 @@ import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoContentEnum; import com.dxhy.order.constant.OrderInfoEnum; import com.dxhy.order.constant.OrderManagementConstant; +import com.dxhy.order.consumer.modules.order.model.dto.RewriteBzdhDTO; +import com.dxhy.order.consumer.modules.order.service.OrderBzdhService; import com.dxhy.order.model.*; import com.dxhy.order.model.sk.kp.CommonInvoiceStatus; import com.dxhy.order.utils.CommonUtils; @@ -73,6 +75,8 @@ public class OrderInvoiceController { @Resource private SpecialInvoiceReversalService specialInvoiceReversalService; + @Resource + private OrderBzdhService bzdhService; /** @@ -133,6 +137,7 @@ public class OrderInvoiceController { /** * 生成预制发票(非拆分场景) + * * @param pageInvoiceReq * @return */ @@ -200,7 +205,7 @@ public class OrderInvoiceController { } else { if (CommonUtils.judgeIsFgTerminalType(terminalCode)) { - R result = commonInterfaceService.dealWithSldStartV3( "", commonOrder.getOrderInfo().getFpzlDm(), commonOrder.getOrderInfo().getXhfNsrsbh(), commonOrder.getOrderInfo().getQdBz(), terminalCode); + R result = commonInterfaceService.dealWithSldStartV3("", commonOrder.getOrderInfo().getFpzlDm(), commonOrder.getOrderInfo().getXhfNsrsbh(), commonOrder.getOrderInfo().getQdBz(), terminalCode); log.debug("{}受理点查询结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(result)); if (!OrderInfoContentEnum.SUCCESS.getKey().equals(String.valueOf(result.get(OrderManagementConstant.CODE)))) { return R.error(String.valueOf(result.get(OrderManagementConstant.MESSAGE))); @@ -221,7 +226,7 @@ public class OrderInvoiceController { try { return invoiceService.updateAndInvoice(paramList, paramMap, commonOrder.getUserId(), shList); } catch (NumberFormatException e) { - log.error("{},订单编辑后开票异常：{}",LOGGER_MSG,e.getMessage()); + log.error("{},订单编辑后开票异常：{}", LOGGER_MSG, e.getMessage()); return R.error("订单编辑后开票异常"); } } @@ -345,7 +350,7 @@ public class OrderInvoiceController { @PostMapping("/updateOrderStatus") @SysLog(operation = "订单删除rest接口", operationDesc = "逻辑删除订单单据", key = "订单删除") public R updateOrderStatus( - @ApiParam(name = "pageRequestList", value = "需要同步数据数组") @RequestBody List pageRequestList,String ly) { + @ApiParam(name = "pageRequestList", value = "需要同步数据数组") @RequestBody List pageRequestList, String ly) { log.debug("{}订单删除请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageRequestList)); /** * 需要使用到PageRequestVO对象中的,(orderProcessId,xhfNsrsbh) @@ -390,7 +395,7 @@ public class OrderInvoiceController { errorMsgList.append(preStr).append(OrderInfoContentEnum.UPDATE_ORDER_STATUS_QUERY_NULL.getMessage()).append("\r\n"); continue; } - if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly()) && StringUtils.isEmpty(ly)){ + if (OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly()) && StringUtils.isEmpty(ly)) { errorMsgList.append(preStr).append(OrderInfoContentEnum.UPDATE_ORDER_STATUS_YWXT.getMessage()).append("\r\n"); continue; } @@ -567,7 +572,7 @@ public class OrderInvoiceController { if (StringUtils.isBlank(customInvoiceQuota)) { return R.error("用户自定义限额不能为空"); } - if(!NumberUtil.isNumber(customInvoiceQuota)){ + if (!NumberUtil.isNumber(customInvoiceQuota)) { return R.error("用户自定义限额只能是数字"); } if (StringUtils.isBlank(hsbz)) { @@ -594,5 +599,15 @@ public class OrderInvoiceController { } return R.ok(); } + + /** + * 修改报账单号 + * + * @return + */ + @PostMapping("/rewriteBzdh") + public R rewriteBzdh(@RequestBody RewriteBzdhDTO dto) { + return bzdhService.rewriteBzdh(dto); + } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/dto/RewriteBzdhDTO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/dto/RewriteBzdhDTO.java new file mode 100644 index 00000000..cb4eca4f --- /dev/null +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/dto/RewriteBzdhDTO.java @@ -0,0 +1,16 @@ +package com.dxhy.order.consumer.modules.order.model.dto; + +import lombok.Data; + +/** + * @Description 回写报账单号 + * @Author 巩权林 + * @Date 2023/3/27 15:50 + **/ +@Data +public class RewriteBzdhDTO { + private String fpdm; + private String fphm; + private String xhfNsrsbh; + private String bzdh; +} diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderBzdhService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderBzdhService.java new file mode 100644 index 00000000..2217571d --- /dev/null +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderBzdhService.java @@ -0,0 +1,8 @@ +package com.dxhy.order.consumer.modules.order.service; + +import com.dxhy.order.consumer.modules.order.model.dto.RewriteBzdhDTO; +import com.dxhy.order.model.R; + +public interface OrderBzdhService { + R rewriteBzdh(RewriteBzdhDTO dto); +} diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderBzdhServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderBzdhServiceImpl.java new file mode 100644 index 00000000..142a1062 --- /dev/null +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderBzdhServiceImpl.java @@ -0,0 +1,55 @@ +package com.dxhy.order.consumer.modules.order.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.dxhy.order.consumer.dao.OrderProcessInfoMapper; +import com.dxhy.order.consumer.modules.order.model.dto.RewriteBzdhDTO; +import com.dxhy.order.consumer.modules.order.service.OrderBzdhService; +import com.dxhy.order.consumer.modules.order.service.OrderInfoService; +import com.dxhy.order.consumer.modules.order.service.OrderProcessInfoExtService; +import com.dxhy.order.invoice.module.invoice.service.OrderInvoiceInfoService; +import com.dxhy.order.model.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +/** + * @Description + * @Author 巩权林 + * @Date 2023/3/27 15:53 + **/ +@Service +public class OrderBzdhServiceImpl implements OrderBzdhService { + + @Autowired + private OrderInvoiceInfoService orderInvoiceInfoService; + + @Autowired + private OrderInfoService orderInfoService; + + @Autowired + private OrderProcessInfoMapper orderProcessInfoMapper; + + + @Override + public R rewriteBzdh(RewriteBzdhDTO dto) { + // 修改报账单号 + List xhfNsrsbhList = Collections.singletonList(dto.getXhfNsrsbh()); + OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfoByFpdmAndFphm(dto.getFpdm(), dto.getFphm(), xhfNsrsbhList); + if (orderInvoiceInfo == null) { + return R.error("找不到订单与发票对应关系"); + } + + OrderProcessInfo orderProcessInfo = orderProcessInfoMapper.selectByOrderId(orderInvoiceInfo.getOrderInfoId(), xhfNsrsbhList); + if(ObjectUtil.isNull(orderProcessInfo)){ + return R.error("找不到订单处理业务"); + } + + orderProcessInfo.setBzdh(dto.getBzdh()); + orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfo, xhfNsrsbhList); + return R.ok(); + } +}