|
|
@@ -439,10 +439,12 @@ class OwnerPriceOperationService
|
|
|
|
|
|
if ($rule->strategy=='起步'){
|
|
|
$startNumber = $rule->amount;
|
|
|
- $money = $startNumber ? $startNumber*$rule->unit_price : $rule->unit_price;
|
|
|
-
|
|
|
+ $money = 0;
|
|
|
if ($unitName && $startNumber && $unitName != $units[$rule->unit_id])return -3; //校验单位是否一致
|
|
|
- if ($startNumber)$matchObject=$this->settingCount($matchObject,$columnMapping[8],$startNumber);
|
|
|
+ if ($startNumber){
|
|
|
+ $money = $rule->unit_price;
|
|
|
+ $matchObject=$this->settingCount($matchObject,$columnMapping[8],$startNumber);
|
|
|
+ }
|
|
|
if ($matchObject)foreach ($matchObject as $package)$money += $package[$columnMapping[8]] * $package["price"];
|
|
|
if (!$startNumber && $money<$rule->unit_price)$money = $rule->unit_price;
|
|
|
return $money+$surcharge;
|