This commit is contained in:
Jerry Yan 2020-12-12 19:50:11 +08:00
parent 67e5f0214b
commit 218c48ed7a

View File

@ -103,6 +103,11 @@ class UserVouchers extends Base{
$personAlreadyProductNum = $personNum * round(($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($productScale*0.01),2); $personAlreadyProductNum = $personNum * round(($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($productScale*0.01),2);
$personAlreadyCouponsNum = $personNum * round(($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($couponsScale*0.01),2); $personAlreadyCouponsNum = $personNum * round(($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($couponsScale*0.01),2);
} }
//都小于就算了
if($v['expectedProductNum'] < $personAlreadyProductNum && $v['expectedCouponsNum'] < $personAlreadyCouponsNum){
$personAlreadyProductNum = 0;
$personAlreadyCouponsNum = 0;
}
//实际有预获产品券小于应给值 //实际有预获产品券小于应给值
if($v['expectedProductNum'] < $personAlreadyProductNum){ if($v['expectedProductNum'] < $personAlreadyProductNum){
$personAlreadyCouponsNum += $personAlreadyProductNum; $personAlreadyCouponsNum += $personAlreadyProductNum;
@ -113,11 +118,6 @@ class UserVouchers extends Base{
$personAlreadyProductNum += $personAlreadyCouponsNum; $personAlreadyProductNum += $personAlreadyCouponsNum;
$personAlreadyCouponsNum = 0; $personAlreadyCouponsNum = 0;
} }
//都小于就算了
if($v['expectedProductNum'] < $personAlreadyProductNum || $v['expectedCouponsNum'] < $personAlreadyCouponsNum){
$personAlreadyProductNum = 0;
$personAlreadyCouponsNum = 0;
}
if($personAlreadyProductNum >= 0.01){ if($personAlreadyProductNum >= 0.01){