Merge branch 'ww' into test
This commit is contained in:
commit
6c2ef5d75b
|
|
@ -267,7 +267,7 @@ public class TbProductServiceImpl implements TbProductService {
|
||||||
if (!CollectionUtils.isEmpty(skuCons)) {
|
if (!CollectionUtils.isEmpty(skuCons)) {
|
||||||
Integer productSkuId = skuCons.get(0).getProductSkuId();
|
Integer productSkuId = skuCons.get(0).getProductSkuId();
|
||||||
if (productSkuId != 0) {//添加至商品
|
if (productSkuId != 0) {//添加至商品
|
||||||
productNewVo.setIsSaveSku(1);
|
productNewVo.setIsSaveSku(2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ public class TbProductNewVo {
|
||||||
//退款是否退回库存
|
//退款是否退回库存
|
||||||
private Integer isRefundStock = 1;
|
private Integer isRefundStock = 1;
|
||||||
|
|
||||||
private Integer isSaveSku = 0;
|
private Integer isSaveSku = 1;
|
||||||
|
|
||||||
//库存警戒线
|
//库存警戒线
|
||||||
private Integer warnLine = 0;
|
private Integer warnLine = 0;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue