|
@@ -1498,8 +1498,8 @@ class ProductClass extends BaseClass
|
|
|
$upData['hjAddPrice'] = $data['hjAddPrice'];
|
|
$upData['hjAddPrice'] = $data['hjAddPrice'];
|
|
|
}
|
|
}
|
|
|
if(floatval($price)!=floatval($product->price) || floatval($skPrice)!=floatval($product->skPrice) || floatval($hjPrice)!=floatval($product->hjPrice)){
|
|
if(floatval($price)!=floatval($product->price) || floatval($skPrice)!=floatval($product->skPrice) || floatval($hjPrice)!=floatval($product->hjPrice)){
|
|
|
- if($shop->join == 0){
|
|
|
|
|
- //util::fail('直营店不能修改价格');
|
|
|
|
|
|
|
+ if($shop->default == 0 && $shop->join == 0){
|
|
|
|
|
+ util::fail('直营分店不能改价');
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
if (isset($data['limitBuy']) && is_numeric($data['limitBuy'])) {
|
|
if (isset($data['limitBuy']) && is_numeric($data['limitBuy'])) {
|
