Merge branch 'release' into test

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<String, String> map = new HashMap<>(2);
@@ -379,14 +380,13 @@ public class CommodityServiceImpl implements CommodityService {
                 resultMap.add(map);
                 continue;
             }
-            num++;
         }
         R ok = R.ok();
         if(resultMap.size() > 0){
             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());
     }
 

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);
-            }
+            }else {
-
-            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 {
                 log.error("{} 请求流水号已存在!批次号为:{},流水号为:{}", LOGGER_MSG, ddqqpch, ddqqlsh);
                 throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010002_V3);
             }