|
|
@@ -311,7 +311,7 @@ public class ProductServiceImpl implements ProductService {
|
|
|
}
|
|
|
Product persistProduct = productDao.findOne(product.getId());
|
|
|
ProductModifyHistory productModifyHistory = new ProductModifyHistory();
|
|
|
- if(product.getStandard() == 1){
|
|
|
+ if((persistProduct.getStandard() == 1)&&(persistProduct.getB2cEnabled() == 1)){
|
|
|
ProductStandardPutOnInfo productStandardPutOnInfo= productStandardPutOnInfoDao.findByProductid(product.getId());
|
|
|
if (product.getPackaging() != null){
|
|
|
productStandardPutOnInfo.setPackaging(product.getPackaging());
|
|
|
@@ -353,6 +353,11 @@ public class ProductServiceImpl implements ProductService {
|
|
|
if (product.getProduceDate() != null){
|
|
|
goods.setProduceDate(product.getProduceDate());
|
|
|
}
|
|
|
+ if(NumberUtil.compare(goods.getMinBuyQty(), goods.getReserve()) > 0) {
|
|
|
+ goods.setStatus(Status.UNAVAILABLE.value());
|
|
|
+ }else {
|
|
|
+ goods.setStatus(Status.AVAILABLE.value());
|
|
|
+ }
|
|
|
GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Modifying.getPhrase());
|
|
|
goodsHistoryDao.save(goodsHistory);
|
|
|
goodsDao.save(goods);
|