|
|
@@ -1276,6 +1276,8 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
throw new IllegalOperatorException("该物料已存在(包装、日期、最小包装量、最小起订量、交期、单位)相同的信息");
|
|
|
}
|
|
|
}
|
|
|
+ // 比较两个goods编辑信息
|
|
|
+ compareGoodsWithModify(nowGoods, goods);
|
|
|
resultGoods = updateGoods(nowGoods, goods);
|
|
|
updateComponentTradeInfos(nowGoods.getUuid());
|
|
|
return ResultMap.success(resultGoods);
|
|
|
@@ -1567,11 +1569,11 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
// Product product = productService.updateProduct(putOnInfo);
|
|
|
updateGoodsRelateInfo(orders, cartList, browsingHistories, null, null, history, nowGoods);
|
|
|
//更新店铺推荐的信息
|
|
|
- if(isChangeSaleType) { // 如果切换了销售方式
|
|
|
- Set<String> uuids = new HashSet<>();
|
|
|
- uuids.add(nowGoods.getBatchCode());
|
|
|
- recommendProductService.deleteProductsWhenSellerUpdateReserve(storeuuid, uuids);
|
|
|
- } else {
|
|
|
+ if(isChangeSaleType) { // 如果切换了销售方式
|
|
|
+ Set<String> uuids = new HashSet<>();
|
|
|
+ uuids.add(nowGoods.getBatchCode());
|
|
|
+ recommendProductService.deleteProductsWhenSellerUpdateReserve(storeuuid, uuids);
|
|
|
+ } else {
|
|
|
recommendProductService.updateRecommendProductInfo(nowGoods);
|
|
|
}
|
|
|
return nowGoods;
|