From 218c48ed7a63ee0182516554a824c81b8d2eb008 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 12 Dec 2020 19:50:11 +0800
Subject: [PATCH] nmmmmmm
---
hyhproject/common/model/UserVouchers.php | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hyhproject/common/model/UserVouchers.php b/hyhproject/common/model/UserVouchers.php
index d58d55a..6f14b96 100755
--- a/hyhproject/common/model/UserVouchers.php
+++ b/hyhproject/common/model/UserVouchers.php
@@ -102,7 +102,12 @@ class UserVouchers extends Base{
}else{//都大于15
$personAlreadyProductNum = $personNum * round(($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($productScale*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){
$personAlreadyCouponsNum += $personAlreadyProductNum;
@@ -113,12 +118,7 @@ class UserVouchers extends Base{
$personAlreadyProductNum += $personAlreadyCouponsNum;
$personAlreadyCouponsNum = 0;
}
- //都小于就算了
- if($v['expectedProductNum'] < $personAlreadyProductNum || $v['expectedCouponsNum'] < $personAlreadyCouponsNum){
- $personAlreadyProductNum = 0;
- $personAlreadyCouponsNum = 0;
- }
-
+
if($personAlreadyProductNum >= 0.01){