|
|
@@ -778,7 +778,7 @@ public class ProductServiceImpl implements ProductService {
|
|
|
}else {
|
|
|
goods.setStatus(Status.AVAILABLE.value());
|
|
|
}
|
|
|
- GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Modifying.getPhrase());
|
|
|
+ GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Modifying.getPhrase(),false);
|
|
|
goodsHistoryDao.save(goodsHistory);
|
|
|
goodsDao.save(goods);
|
|
|
|
|
|
@@ -1069,7 +1069,7 @@ public class ProductServiceImpl implements ProductService {
|
|
|
for (Long id : idArray) {
|
|
|
Goods goods = goodsDao.findOne(id);
|
|
|
goodsHist = goodsHistoryService.converTGoodsHist(goods,
|
|
|
- GoodsHistory.OperateType.DELETE_FOR_REPEAT.getPhrase());
|
|
|
+ GoodsHistory.OperateType.DELETE_FOR_REPEAT.getPhrase(),false);
|
|
|
goodsHist.setMessage(goodsHist.getMessage() + "匹配后因为重复删除");
|
|
|
goodsHistoryList.add(goodsHist);
|
|
|
goodsDao.delete(id);
|
|
|
@@ -1135,7 +1135,7 @@ public class ProductServiceImpl implements ProductService {
|
|
|
for (Goods goods : goodsList) {
|
|
|
updateGoodsInfo(goods, product);
|
|
|
GoodsHistory goodsHist = goodsHistoryService.converTGoodsHist(goods,
|
|
|
- GoodsHistory.OperateType.Modifying.getPhrase());
|
|
|
+ GoodsHistory.OperateType.Modifying.getPhrase(),false);
|
|
|
//更新购物车信息
|
|
|
List<Cart> cartList = cartDao.findCartByBatch(goods.getBatchCode());
|
|
|
updateCartsInfo(goods, cartList);
|