|
@@ -1941,19 +1941,6 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
goodsHist.setMessage(goodsHist.getMessage() + "该批次下架");
|
|
goodsHist.setMessage(goodsHist.getMessage() + "该批次下架");
|
|
|
goodsHistoryService.save(goodsHist);
|
|
goodsHistoryService.save(goodsHist);
|
|
|
|
|
|
|
|
-// ProductStandardPutOnInfo standardPutOnInfo = productStandardPutOnInfoDao.findOne(goods.getStandprodid());
|
|
|
|
|
-// if(standardPutOnInfo != null) {
|
|
|
|
|
-// standardPutOnInfo.setStatus(Status.REMOVED.value());
|
|
|
|
|
-// standardPutOnInfo.setAvailableOnSale(NumberUtil.add(standardPutOnInfo.getAvailableOnSale(), standardPutOnInfo.getOnSaleQty()));
|
|
|
|
|
-// standardPutOnInfo.setOnSaleQty(0.0d);
|
|
|
|
|
-// productStandardPutOnInfoDao.save(standardPutOnInfo);
|
|
|
|
|
-//
|
|
|
|
|
-// Product product = productDao.findOne(standardPutOnInfo.getProductid());
|
|
|
|
|
-// product.setAvailableOnSale(standardPutOnInfo.getAvailableOnSale());
|
|
|
|
|
-// product.setOnSaleQty(standardPutOnInfo.getOnSaleQty());
|
|
|
|
|
-// productDao.save(product);
|
|
|
|
|
-// }
|
|
|
|
|
-
|
|
|
|
|
//下架对应的批次
|
|
//下架对应的批次
|
|
|
goodsDao.deleteByBatchCode(goods.getBatchCode());
|
|
goodsDao.deleteByBatchCode(goods.getBatchCode());
|
|
|
return ResultMap.success(goods);
|
|
return ResultMap.success(goods);
|
|
@@ -2277,28 +2264,11 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
histories.add(goodsHistory);
|
|
histories.add(goodsHistory);
|
|
|
goodsUpdate.add(goods);
|
|
goodsUpdate.add(goods);
|
|
|
|
|
|
|
|
-// ProductStandardPutOnInfo standardPutOnInfo = productStandardPutOnInfoDao.findOne(goods.getStandprodid());
|
|
|
|
|
-// if(standardPutOnInfo != null) {
|
|
|
|
|
-// standardPutOnInfo.setStatus(Status.REMOVED.value());
|
|
|
|
|
-// standardPutOnInfo.setAvailableOnSale(NumberUtil.add(standardPutOnInfo.getAvailableOnSale(), standardPutOnInfo.getOnSaleQty()));
|
|
|
|
|
-// standardPutOnInfo.setOnSaleQty(0.0d);
|
|
|
|
|
-// productStandardPutOnInfoList.add(standardPutOnInfo);
|
|
|
|
|
-//
|
|
|
|
|
-// Product product = productDao.findOne(standardPutOnInfo.getProductid());
|
|
|
|
|
-// product.setAvailableOnSale(standardPutOnInfo.getAvailableOnSale());
|
|
|
|
|
-// product.setOnSaleQty(standardPutOnInfo.getOnSaleQty());
|
|
|
|
|
-// products.add(product);
|
|
|
|
|
-// }else {
|
|
|
|
|
-// throw new IllegalOperatorException("找不到对应的标准上架产品信息");
|
|
|
|
|
-// }
|
|
|
|
|
-// productStandardPutOnInfoService.updateAvailableQty(goods.getStandprodid(), goods.getReserve());
|
|
|
|
|
uuids.add(goods.getUuid());
|
|
uuids.add(goods.getUuid());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
goodsDao.delete(goodsUpdate);
|
|
goodsDao.delete(goodsUpdate);
|
|
|
goodsHistoryDao.save(histories);
|
|
goodsHistoryDao.save(histories);
|
|
|
-// productDao.save(products);
|
|
|
|
|
-// productStandardPutOnInfoDao.save(productStandardPutOnInfoList);
|
|
|
|
|
for (String uuid : uuids) {
|
|
for (String uuid : uuids) {
|
|
|
updateComponentTradeInfos(uuid);
|
|
updateComponentTradeInfos(uuid);
|
|
|
}
|
|
}
|
|
@@ -2360,8 +2330,6 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
orderService.save(orders);
|
|
orderService.save(orders);
|
|
|
cartService.saveCart(carts);
|
|
cartService.saveCart(carts);
|
|
|
browsingHistoryService.saveGoodsBrowsingHistoryList(browsingHistoryList);
|
|
browsingHistoryService.saveGoodsBrowsingHistoryList(browsingHistoryList);
|
|
|
-// productStandardPutOnInfoService.save(putOnInfo);
|
|
|
|
|
-// productService.save(product);
|
|
|
|
|
goodsHistoryService.save(goodsHistory);
|
|
goodsHistoryService.save(goodsHistory);
|
|
|
return ResultMap.success(null);
|
|
return ResultMap.success(null);
|
|
|
}
|
|
}
|