diff --git a/hyhproject/common/model/UserVouchers.php b/hyhproject/common/model/UserVouchers.php index 6f14b96..4301d1c 100755 --- a/hyhproject/common/model/UserVouchers.php +++ b/hyhproject/common/model/UserVouchers.php @@ -95,10 +95,10 @@ class UserVouchers extends Base{ continue; }else if($v['expectedProductNum'] <= $minNumer){//预获产品券小于15; $personAlreadyProductNum = 0; - $personAlreadyCouponsNum = round($personNum * ($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($couponsScale*0.01),2); + $personAlreadyCouponsNum = round($personNum * ($v['expectedProductNum'] + $v['expectedCouponsNum']),2); }else if($v['expectedCouponsNum'] <= $minNumer){//预获优惠券小于15 $personAlreadyCouponsNum = 0; - $personAlreadyProductNum = round($personNum * ($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($productScale*0.01),2); + $personAlreadyProductNum = round($personNum * ($v['expectedProductNum'] + $v['expectedCouponsNum']),2); }else{//都大于15 $personAlreadyProductNum = $personNum * round(($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($productScale*0.01),2); $personAlreadyCouponsNum = $personNum * round(($v['expectedProductNum'] + $v['expectedCouponsNum']) * ($couponsScale*0.01),2); @@ -122,14 +122,14 @@ class UserVouchers extends Base{ if($personAlreadyProductNum >= 0.01){ - $this->insertVouchersNotice($v['userId'],0,$personAlreadyProductNum,0,$desc='分润扣减',0,0);//预获产品券减 + $this->insertVouchersNotice($v['userId'],0,$personAlreadyProductNum,0,$desc='预获产品券日转换所扣',0,0);//预获产品券减 //加入变动记录,最后一位//1产品券2优惠券3旺旺券4现金券 $this->insertAlreadyVouchersNotice($v['userId'],0,$personAlreadyProductNum,0,'预获产品券日转换所得',1,1); // Model('common/LogMoneys')->addMoneyLog(0,$v['userId'],0,2,'预获产品券日转换所得',1,$personAlreadyProductNum,'dayPay',1); $data['alreadyProductNum'] = $v['alreadyProductNum'] + $personAlreadyProductNum;//已获产品券加 } if($personAlreadyCouponsNum >= 0.01){ - $this->insertVouchersNotice($v['userId'],0,0,$personAlreadyCouponsNum,$desc='分润扣减',0,0);//预获优惠券减 + $this->insertVouchersNotice($v['userId'],0,0,$personAlreadyCouponsNum,$desc='预获优惠券日转换所扣',0,0);//预获优惠券减 //加入变动记录,最后一位//1产品券2优惠券3旺旺券4现金券 $this->insertAlreadyVouchersNotice($v['userId'],0,0,$personAlreadyCouponsNum,'预获优惠券日转换所得',1,1); // Model('common/LogMoneys')->addMoneyLog(0,$v['userId'],0,2,'预获优惠券日转换所得',1,$personAlreadyCouponsNum,'dayPay',2); @@ -152,11 +152,11 @@ class UserVouchers extends Base{ $count = abs((float)$_each["expectedProductNum"]); if($_each["helpSaleNum"] < 0)$count+=abs((float)$_each["helpSaleNum"]); model('common/UserVouchers')->insertVouchersNotice($_each["userId"], 0, 0, $count*((float)dataConf("deductionRateWhennegPreCoupons")/100), - "预获优惠券日损耗所扣", 0); + "助购券负值预获优惠券日损耗所扣", 0); }else{ $count = abs((float)$_each["helpSaleNum"]); model('common/UserVouchers')->insertVouchersNotice($_each["userId"], 0, $count*((float)dataConf("deductionRateWhennegPreCoupons")/100), - 0, "预获产品券日损耗所扣", 0); + 0, "助购券负值预获产品券日损耗所扣", 0); } } Db::commit();