Merge branch 'release' into test

release
gaorl 2 years ago
commit 5e20c4a712
  1. 8
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@ -1928,9 +1928,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
OrderItemInfo item = new OrderItemInfo();
item.setId(itemInfo.getId());
item.setZnfm(ConfigureConstant.STRING_0);
if (StringUtils.isBlank(itemInfo.getZxbm())) {
item.setZxbm(itemInfo.getZxbm());
}
item.setZxbm(itemInfo.getZxbm());
items.add(item);
continue;
}
@ -1960,9 +1958,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
OrderItemInfo item = new OrderItemInfo();
item.setId(itemInfo.getId());
item.setZnfm(ConfigureConstant.STRING_0);
if (StringUtils.isBlank(itemInfo.getZxbm())) {
item.setZxbm(itemInfo.getZxbm());
}
item.setZxbm(itemInfo.getZxbm());
items.add(item);
}
repeatEnding.put(itemInfo.getZxbm(),commodityCodeEntity);

Loading…
Cancel
Save