feature：合并明细

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

@@ -2027,13 +2027,14 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         }
         List<OrderItemInfo> collect = null;
         if(itemList != null){
-            collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isBlank(t.getSpbm())).collect(Collectors.toList());
+            collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isNotBlank(t.getSpbm())).collect(Collectors.toList());
             if(ObjectUtil.isNull(collect)){
                 return R.error("税收编码为空的不允许合并，请先更新税收编码");
             }
         }else{
             collect = orderItemInfos;
         }
+        log.debug("合并分组前{}",JSONObject.toJSONString(collect));
         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());