Commit 83e0feb9 authored by 332784038@qq.com's avatar 332784038@qq.com

单独将复制价格的业务功能改动优选合并处理

parent 07704cb6
......@@ -3555,13 +3555,13 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
snapshotList.add(snapshot);
dbItem.setUpdater(String.valueOf(loginUserId));
updateColumn(dbItem, productPrice);
productPriceMapper.updateById(dbItem);
} else {
dbItem = ObjectUtil.clone(productPrice);
dbItem.setProductId(productDO.getId());
dbItem.setWarehouseLineId(lineId);
dbItem.setShippingChannelId(shippingChannelId);
dbItem.setId(null);
if (dbItem.getNeedBook() == null) {
dbItem.setNeedBook(0);
}
......@@ -3589,12 +3589,18 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
dbItem.setBlacklist(0);
dbItem.setStatus(0);
dbItem.setCreateTime(current);
productPriceMapper.insert(dbItem);
dbItem.setId(null);
}
dbItem.setUpdateTime(current);
String transportType = lineTransportTypeMap.get(lineId);
initBasePrice(dbItem, transportType);
if (Objects.isNull(dbItem.getId())){
productPriceMapper.insert(dbItem);
}else {
productPriceMapper.updateById(dbItem);
}
//添加修改日志,需要查询特需和阶梯,所以需要在修改之前执行
batchAddSnapshot(snapshotList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment