From 67e5f0214bb86183f46dab9e420d7517fcb70c2c Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 12 Dec 2020 19:19:13 +0800
Subject: [PATCH] nmmmmmm

---
 hyhproject/common/model/UserVouchers.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hyhproject/common/model/UserVouchers.php b/hyhproject/common/model/UserVouchers.php
index 351a98f..d58d55a 100755
--- a/hyhproject/common/model/UserVouchers.php
+++ b/hyhproject/common/model/UserVouchers.php
@@ -87,19 +87,19 @@ class UserVouchers extends Base{
                 //都小于15不统计，直接加入代慢付
                 //   原：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代快付值
                 // 改为：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代慢付值
+                $couponsScale = dataConf('hasCoupousScale');//优惠券比例
+                $productScale = 100 - $couponsScale;//产品券比例
                 if($v['expectedProductNum'] <= $minNumer && $v['expectedCouponsNum'] <= $minNumer){
                     $toSlowNum = round($personNum * ($v['expectedProductNum'] + $v['expectedCouponsNum']),2);
                     $sm->addSysSummary(0,$toSlowNum,1,'用户ID['.$v['userId'].']双预获券都小于15/日转换退回');
                     continue;
                 }else if($v['expectedProductNum'] <= $minNumer){//预获产品券小于15;
                     $personAlreadyProductNum = 0;
-                    $personAlreadyCouponsNum = round($personNum * ($v['expectedProductNum'] + $v['expectedCouponsNum']),2);
+                    $personAlreadyCouponsNum = round($personNum * ($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($couponsScale*0.01),2);
                 }else if($v['expectedCouponsNum'] <= $minNumer){//预获优惠券小于15
                     $personAlreadyCouponsNum = 0;
-                    $personAlreadyProductNum = round($personNum * ($v['expectedProductNum'] + $v['expectedCouponsNum']),2);
+                    $personAlreadyProductNum = round($personNum * ($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($productScale*0.01),2);
                 }else{//都大于15
-                    $couponsScale = dataConf('hasCoupousScale');//优惠券比例
-                    $productScale = 100 - $couponsScale;//产品券比例
                     $personAlreadyProductNum = $personNum * round(($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($productScale*0.01),2);
                     $personAlreadyCouponsNum = $personNum * round(($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($couponsScale*0.01),2);
                 }