From 3f902cb70c22f67de087ef67f4d24f8e6be06e36 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 21 Jun 2023 16:34:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=85=A5=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/commodity/service/impl/CommodityServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index ae66cb8f..f5a1c52e 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -325,6 +325,7 @@ public class CommodityServiceImpl implements CommodityService { for (CommodityCodeEntity commodityCodeEntity : commodityCodeList) { commodityCodeEntity.setSpbm(StringUtil.fillZero(commodityCodeEntity.getSpbm(), ConfigureConstant.INT_19)); //ent_id + encoding + spmc + num++; int i1 = commodityMapper.queryCountByEntAndEncode(commodityCodeEntity.getZxbm(), "", commodityCodeEntity.getEntId()); if(i1>0){ Map map = new HashMap<>(2); @@ -379,7 +380,6 @@ public class CommodityServiceImpl implements CommodityService { resultMap.add(map); continue; } - num++; } R ok = R.ok(); if(resultMap.size() > 0){ From e384b7363eb8c52263c2451e25e3935514f7bbf3 Mon Sep 17 00:00:00 2001 From: gaorl Date: Sat, 24 Jun 2023 17:33:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=85=A5=E8=B0=83=E6=95=B4=E3=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commodity/service/impl/CommodityServiceImpl.java | 2 +- .../impl/AllocateInvoiceInterfaceServiceImplV3.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index f5a1c52e..4d8bc18d 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -386,7 +386,7 @@ public class CommodityServiceImpl implements CommodityService { ok = R.error(); } - return ok.put("list", resultMap).put("msg", "导入成功" + num + "条").put("count", commodityCodeList.size()) + return ok.put("list", resultMap).put("msg", "导入成功" + (commodityCodeList.size() - num )+ "条").put("count", commodityCodeList.size()) .put("fail", resultMap.size()); } 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 c2a2752d..0e566834 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 @@ -1278,13 +1278,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt } } throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010015_V3); - } - - if (OrderInfoEnum.ORDER_STATUS_4.getKey().equals(selectOrderProcessInfo.getDdzt()) - || OrderInfoEnum.ORDER_STATUS_6.getKey().equals(selectOrderProcessInfo.getDdzt()) - || OrderInfoEnum.ORDER_STATUS_8.getKey().equals(selectOrderProcessInfo.getDdzt())) { - flag = true; - } else { + }else { log.error("{} 请求流水号已存在!批次号为:{},流水号为:{}", LOGGER_MSG, ddqqpch, ddqqlsh); throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010002_V3); }