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 f1328afe..b28b7ac0 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 @@ -1858,7 +1858,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { if(ObjectUtil.isNull(orderItemInfos)){ return R.error("税收编码为空的不允许合并,请先更新税收编码"); } - Map> collect1 = collect.stream().collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getGgxh() + t.getSl() + t.getSpbm())); + Map> collect1 = collect.stream().collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getXmdw() + t.getGgxh() + t.getSl() + t.getSpbm())); List orderItemInfoList = new ArrayList<>(); List deleteItem = new ArrayList<>(); for (List value : collect1.values()) {