feature：明细合并名称、规格型号、单位判空，转换为空字符串

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -2016,14 +2016,19 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         }
         List<OrderItemInfo> collect = null;
         if(itemList != null){
-            collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isNotBlank(t.getSpbm())).collect(Collectors.toList());
+            collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isBlank(t.getSpbm())).collect(Collectors.toList());
-            if(ObjectUtil.isNull(orderItemInfos)){
+            if(ObjectUtil.isNull(collect)){
                 return R.error("税收编码为空的不允许合并，请先更新税收编码");
             }
         }else{
             collect = orderItemInfos;
         }
-        Map<String, List<OrderItemInfo>> collect1 = collect.stream().collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getXmdw() + t.getGgxh() + t.getSl() + t.getSpbm()));
+        Map<String, List<OrderItemInfo>> collect1 = collect.stream().map(t->{
+            t.setXmmc(StringUtils.isBlank(t.getXmmc())?"":t.getXmmc());
+            t.setXmdw(StringUtils.isBlank(t.getXmdw())?"":t.getXmdw());
+            t.setGgxh(StringUtils.isBlank(t.getGgxh())?"":t.getGgxh());
+            return t;
+        }).collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getXmdw() + t.getGgxh() + t.getSl() + t.getSpbm()));
         List<OrderItemInfo> orderItemInfoList = new ArrayList<>();
         List<String> deleteItem = new ArrayList<>();
         for (List<OrderItemInfo> value : collect1.values()) {