|
|
|
@ -953,7 +953,11 @@ public class OrderMergeServiceImpl implements OrderMergeService { |
|
|
|
|
List<String> deleteItem = new ArrayList<>(); |
|
|
|
|
log.info("明细合并前明细数据,{}",JSONObject.toJSONString(orderItemInfos)); |
|
|
|
|
for (List<OrderItemInfo> value : collect1.values()) { |
|
|
|
|
if(value.size() == 1){continue;} |
|
|
|
|
if(value.size() == 1){ |
|
|
|
|
orderItemInfoList.add(value.get(0)); |
|
|
|
|
deleteItem.add(value.get(0).getId()); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
BigDecimal xmsl = new BigDecimal("0"); |
|
|
|
|
BigDecimal xmje = new BigDecimal("0"); |
|
|
|
|
BigDecimal se = new BigDecimal("0"); |
|
|
|
|