|
@@ -327,7 +327,8 @@ class GoodsService extends BaseService
|
|
|
$skuStock = isset($skuData['stock'])?$skuData['stock']:0;
|
|
$skuStock = isset($skuData['stock'])?$skuData['stock']:0;
|
|
|
$skuName = isset($skuData['sku_name'])?$skuData['sku_name']:'';
|
|
$skuName = isset($skuData['sku_name'])?$skuData['sku_name']:'';
|
|
|
$price = $skuType==2 ? $skuPrice : $item['price'];
|
|
$price = $skuType==2 ? $skuPrice : $item['price'];
|
|
|
- $profitRate = isset($item['profit_rate']) && $item['profit_rate']>0?$item['profit_rate']: $profitRate;
|
|
|
|
|
|
|
+ $goodsProfitRate = isset($item['profit_rate']) && $item['profit_rate']>0?$item['profit_rate']: 0;
|
|
|
|
|
+ $profitRate = $goodsProfitRate>0 && $goodsProfitRate<100?$goodsProfitRate: $profitRate;
|
|
|
$costPrice = $skuType==2 ? $costPrice : $item['cost_price'];
|
|
$costPrice = $skuType==2 ? $costPrice : $item['cost_price'];
|
|
|
unset($item['skus']);
|
|
unset($item['skus']);
|
|
|
if(isset($item['type_name'])){
|
|
if(isset($item['type_name'])){
|
