q792602257/qlg.tsgz.moe
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
Jerry Yan
2020-09-21 08:15:51 +08:00
parent 539afccbc7
commit d2593d1c87
8 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hyhproject/common/model/Orders.php
View File

@ -1478,7 +1478,8 @@ class Orders extends Base{
//换算为3级循环等级
$nowLevel = $shopLevel % 3;
//升级到下一级所需金额
$upgradeMoney = dataConf('helpUpgradeLevel'.($nowLevel+1).'BuyMoney');
// 助微吧再次销售限购物额为≥？元 @2020/09/19
$upgradeMoney = dataConf('helpUpgradeLevel1BuyMoney');
//获取助微吧购物金额
$buyHelpMoney = $userInfo['buyHelpMoney'] + $order['realTotalMoney'];
//查看是否够升级条件

5
hyhproject/common/model/Settlements.php
View File

@ -38,12 +38,15 @@ class Settlements extends Base
// 5，获得预获产品券为被扣手续费的100% buyerPreProductInProductHandlingFeeScale
// 6，获得预获产品券为被扣税费的100% buyerPreProductInProductTaxFeeScale
$buyerPreProductNum = round(($totalMoney + $order->deliverMoney)* (dataConf('buyerPreProductInProductScale')*0.01),2);//1
// 购户获得预获产品券最高占产品额比例？%
$buyerPreProductNum = round(($totalMoney + $order->deliverMoney),2);//1
$buyerMaxCouponsNum = round(($totalMoney + $order->deliverMoney)* (dataConf('buyerPreProductInProductScale')*0.01),2);//1
$buyerPreCoupousNum = round($discountMoney * (dataConf('buyerPreCoupousInSaleScale')*0.01),2);//2
// $buyerPreProductNum += round($order->productHandlingFee * (dataConf('buyerPreProductInHandlingFeeScale')*0.01),2);//3
// $buyerPreProductNum += round($order->productTaxFee * (dataConf('buyerPreProductInTaxFeeScale')*0.01),2);//4
// $buyerPreProductNum += round($order->couponsHandlingFee * (dataConf('buyerPreProductInProductHandlingFeeScale')*0.01),2);//5
// $buyerPreProductNum += round($order->couponsTaxFee * (dataConf('buyerPreProductInProductTaxFeeScale')*0.01),2);//6
$buyerPreCoupousNum = $buyerPreCoupousNum > $buyerMaxCouponsNum ? $buyerMaxCouponsNum : $buyerPreCoupousNum;
if($buyerPreProductNum >= 0.01 || $buyerPreCoupousNum>=0.01){
if(3 == $order->goodsType){
Model('common/UserVouchers')->insertVouchersNotice($order->userId,$orderId,$buyerPreProductNum,$buyerPreCoupousNum*((float)dataConf('helpSaleCouponsCalBase')/100),'交易订单【'.$order->orderNo.'】购户购物所得');

2
hyhproject/common/model/Users.php
View File

@ -337,7 +337,7 @@ class Users extends Base{
$fp = fopen("reg.lock", "r");
if(flock($fp,LOCK_EX | LOCK_NB)) {//if(flock($fp,LOCK_EX))阻塞(等待)模式
//检测账号是否存在
$crs = ($loginName);
$crs = WSTCheckLoginKey($loginName);
if($crs['status']!=1){
flock($fp,LOCK_UN);
fclose($fp);