From 598277491a3ea6fafc02030386e9f25f9eed5c27 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Mon, 17 Apr 2023 11:31:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=9B=E5=BC=80=E7=BA=A2=E7=A5=A8=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E8=93=9D=E7=A5=A8=E8=A1=A5=E5=85=A8=E7=BA=A2=E7=A5=A8?= =?UTF-8?q?=E7=9A=84gsdm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/order/constant/OrderInfoContentEnum.java | 1 + .../impl/GenerateReadyOpenOrderServiceImpl.java | 11 +++++++++-- .../impl/AllocateInvoiceInterfaceServiceImplV3.java | 3 +++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java index 3b312180..84ef88d0 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java @@ -1866,6 +1866,7 @@ public enum OrderInfoContentEnum { INVOICE_ERROR_CODE_010006_V3("010006", "发票开具请求税号对应的套餐余量不足"), INVOICE_ERROR_CODE_010007_V3("010007", "发票开具请求税号对应的套餐异常"), INVOICE_ERROR_CODE_010008_V3("010008", "发票开具请求税号对应的企业信息未设置"), + INVOICE_ERROR_CODE_010008K_V3("010008K", "销方下未查询到此客户,请先在发票平台维护"), INVOICE_ERROR_CODE_010009_V3("010009", "发票开具请求受理点ID不能为空"), INVOICE_ERROR_CODE_010010_V3("010010", "发票开具请求数据错误，订单请求流水号正在处理中,请勿重复请求"), INVOICE_ERROR_CODE_010011_V3("010011", "发票开具请求数据错误，动态码信息不存在"), diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java index 86e4bdb2..3153c37d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java @@ -17,8 +17,10 @@ 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.dao.OrderProcessInfoMapper; import com.dxhy.order.consumer.modules.order.service.GenerateReadyOpenOrderService; import com.dxhy.order.consumer.modules.order.service.OrderCommonService; +import com.dxhy.order.consumer.modules.order.service.OrderProcessService; import com.dxhy.order.consumer.modules.validate.service.ValidateOrderInfoService; import com.dxhy.order.consumer.openapi.service.CommonInterfaceService; import com.dxhy.order.consumer.utils.BeanTransitionUtils; @@ -87,6 +89,9 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder @Resource private TaxSpecialPolicyUtil taxSpecialPolicyUtil; + @Resource + private OrderProcessInfoMapper orderProcessInfoMapper; + private void supplement(CommonOrderInfo commonOrderInfo) { commonOrderInfo.getOrderInfo().setFpqqlsh(apiInvoiceCommonMapperService.getGenerateShotKey()); @@ -633,8 +638,10 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder orderProcessInfo.setKb(orderItemInfos.get(0).getKb()); orderProcessInfo.setOriginOrderId(orderInfo.getId()); orderProcessInfo.setOriginDdh(orderInfo.getDdh()); - if(ObjectUtil.isNull(orderProcessInfo.getGsdm()) || StrUtil.isBlank(orderProcessInfo.getGsdm())){ - orderProcessInfo.setGsdm(orderInfo.getGsdm()); + if(StrUtil.isNotBlank(commonOrderInfo.getOrderInfo().getYfpHm())){ + OrderInvoiceInfo orderInvoiceInfoY = orderInvoiceInfoService.selectOrderInvoiceInfoByFpdmAndFphm(commonOrderInfo.getOrderInfo().getYfpDm(), commonOrderInfo.getOrderInfo().getYfpHm(), null); + OrderProcessInfo orderProcessInfoY = orderProcessInfoMapper.selectOrderProcessInfoByProcessId(orderInvoiceInfoY.getOrderProcessInfoId(), null); + orderProcessInfo.setGsdm(orderProcessInfoY.getGsdm()); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index d96d38b0..bbf9a7a1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -1150,6 +1150,9 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), zxbm); if (buyerEntity != null && StringUtils.isNotBlank(buyerEntity.getTaxpayerCode())) { BeanTransitionUtils.transitionOrderBuyerInfo(commonOrderInfo, buyerEntity); + }else { + log.error("{}补全购方信息异常,根据购方编号未查询到购方或者购方税号为空", LOGGER_MSG); + throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010008K_V3); } }