From 98d62a6c10b73f9e91a084379b7101a3af33f845 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Sun, 23 Apr 2023 18:18:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BA=A2=E7=A5=A8=E4=B8=8D=E8=A1=A5?= =?UTF-8?q?=E5=A4=87=E6=B3=A8;=E5=BC=80=E7=BA=A2=E7=A5=A8=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7=E6=A0=A1=E9=AA=8C=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 8 +++++++- .../impl/AllocateInvoiceInterfaceServiceImplV3.java | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 27943233..5c6b8949 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1469,11 +1469,17 @@ public class OrderInfoServiceImpl implements OrderInfoService { List orderProcessInfos = orderProcessInfoMapper.queryOrderInfo(map, null, null); if(orderProcessInfos.size()!=1){ return R.error("根据报账单号未查到到结算单或查询到多条结算单,请检查!"); - }else if(orderProcessInfos.size() == 1 && new BigDecimal(orderProcessInfos.get(0).getKphjje()).compareTo(BigDecimal.ZERO) == -1 ){ + }else if(orderProcessInfos.size() == 1 && new BigDecimal(orderProcessInfos.get(0).getKphjje()).compareTo(BigDecimal.ZERO) == 1 ){ return R.error("报账单号对应的结算单不是负数结算单,请检查!"); }else { op = orderProcessInfos.get(0); } + if(!commonOrderInfo.getOrderInfo().getXhfNsrsbh().equals(op.getXhfNsrsbh())){ + return R.error("报账单号对应的结算单销方税号与当前结算单不一致,请检查!"); + } + if(!commonOrderInfo.getOrderInfo().getGhfNsrsbh().equals(op.getGhfNsrsbh())){ + return R.error("报账单号对应的结算单购方税号与当前结算单不一致,请检查!"); + } } String sld = commonOrderInfo.getOrderInfo().getSld(); String sldMc = commonOrderInfo.getOrderInfo().getSldMc(); 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 29ae79e7..e87e8424 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 @@ -1213,13 +1213,13 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt orderInfo.setSldMc(""); //红字发票添加备注 - String resultBz = CommonUtils.getBz(orderInfo.getBz(), orderInfo.getKplx(), orderInfo.getFpzlDm(), + /*String resultBz = CommonUtils.getBz(orderInfo.getBz(), orderInfo.getKplx(), orderInfo.getFpzlDm(), terminalCode, orderInfo.getYfpDm(), orderInfo.getYfpHm(), kce, orderInfo.getHzxxbbh()); orderInfo.setBz(resultBz); if (StringUtils.isEmpty(orderInfo.getHzxxbbh())) { String resultHzxxbbh = CommonUtils.getHzxxbbh(resultBz, terminalCode); orderInfo.setHzxxbbh(resultHzxxbbh); - } + }*/ } /**