From eb90d5f32ac0a0566cc890bc2d24e53549bc104c Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Thu, 31 Oct 2019 00:19:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=8E=89=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E4=BA=BA=E5=86=99=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hyhproject/common/model/Settlements.php | 11 +++++------ hyhproject/common/model/UserVouchers.php | 9 ++++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/hyhproject/common/model/Settlements.php b/hyhproject/common/model/Settlements.php index a38c079..c0ee7d9 100755 --- a/hyhproject/common/model/Settlements.php +++ b/hyhproject/common/model/Settlements.php @@ -64,8 +64,7 @@ class Settlements extends Base $sellerPreProductNum = round($discountMoney * (dataConf('sellerPreProductInProductScale')*0.01),2);//1 $sellerPreCoupousNum = round($discountMoney * (dataConf('sellerPreCoupousInSaleScale')*0.01),2);//2 $calBaseNum = Db::table("__ORDERS__ o")->join("__ORDER_GOODS__ g", "g.orderId=o.orderId", 'inner') - ->where(['o.orderId'=>$orderId]) - ->sum('g.goodsPrice*g.discountRate*0.01'); + ->where(['o.orderId'=>$orderId])->sum('g.goodsPrice*g.discountRate*0.01'); if($sellerPreProductNum >= 0.01 || $sellerPreCoupousNum>=0.01){ if(3 != $order->goodsType){ // step 3 平台送商户：10000×0.4=4000“预获产品券” @@ -80,27 +79,27 @@ class Settlements extends Base // step 4 平台送商户的推荐人：当消费超过限制值时10000×0.4×0.5×0.5=1000“预获产品券”。 // 当消费低于限制值时10000×0.4×0.5×0.2=400“预获产品券”。 $uUserId = UserTrees::getUpperId($shops["userId"]); - if($uUserId == null || $uUserId = 0){$uUserId = 1;} + if($uUserId == null || $uUserId == 0){$uUserId = 1;} $data = Db::query('SELECT count(`goodsMoney`) as `total` FROM `hyh_orders` WHERE DATE_FORMAT(`createTime`,"%Y%m%d")=DATE_FORMAT(DATE_SUB(now(),INTERVAL 1 day),"%Y%m%d") and `userId`="'.$uUserId.'"'); // 因为count一定会有数据所以不判断了 if($data[0]["total"]<=dataConf("refPreProductYdGTMoney")){ Model('common/UserVouchers')->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductNoInSaleScale")/100), 0,'交易订单【'.$order['orderNo'].'】推荐商户所得',1); }else{ - Model('common/UserVouchers')->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductYesInSaleScale ")/100), + Model('common/UserVouchers')->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductYesInSaleScale")/100), 0,'交易订单【'.$order['orderNo'].'】推荐商户所得',1); } // step 6 平台送自己的推荐人：当消费超过限制值时10000×0.4×0.5×0.5=1000“预获产品券”； // 当消费低于限制值时10000×0.4×0.5×0.2=400“预获产品券”。 $uUserId = UserTrees::getUpperId($order['userId']); - if($uUserId === null){$uUserId = 1;} + if($uUserId == null || $uUserId == 0){$uUserId = 1;} $data = Db::query('SELECT count(`goodsMoney`) as `total` FROM `hyh_orders` WHERE DATE_FORMAT(`createTime`,"%Y%m%d")=DATE_FORMAT(DATE_SUB(now(),INTERVAL 1 day),"%Y%m%d") and `userId`="'.$uUserId.'"'); // 因为count一定会有数据所以不判断了 if($data[0]["total"]<=dataConf("refPreProductYdGTMoney")){ Model('common/UserVouchers')->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductNoInSaleScale")/100), 0,'交易订单【'.$order['orderNo'].'】推荐购户所得',1); }else{ - Model('common/UserVouchers')->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductYesInSaleScale ")/100), + Model('common/UserVouchers')->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductYesInSaleScale")/100), 0,'交易订单【'.$order['orderNo'].'】推荐购户所得',1); } // step 7 平台送自己的被推荐人：10000×0.4×0.5×0.5÷5=200“预获产品券”。 diff --git a/hyhproject/common/model/UserVouchers.php b/hyhproject/common/model/UserVouchers.php index 1410ef0..21c82a0 100755 --- a/hyhproject/common/model/UserVouchers.php +++ b/hyhproject/common/model/UserVouchers.php @@ -114,13 +114,15 @@ class UserVouchers extends Base{ $this->insertVouchersNotice($v['userId'],0,$personAlreadyProductNum,0,$desc='分润扣减',0,0);//预获产品券减 //加入变动记录，最后一位//1产品券2优惠券3旺旺券4现金券 - Model('common/LogMoneys')->addMoneyLog(0,$v['userId'],0,2,'预获产品券转换所得',1,$personAlreadyProductNum,'dayPay',1); + $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);//预获优惠券减 //加入变动记录，最后一位//1产品券2优惠券3旺旺券4现金券 - Model('common/LogMoneys')->addMoneyLog(0,$v['userId'],0,2,'预获优惠券转换所得',1,$personAlreadyCouponsNum,'dayPay',2); + $this->insertAlreadyVouchersNotice($v['userId'],0,0,$personAlreadyCouponsNum,'预获优惠券转换所得',1,1); +// Model('common/LogMoneys')->addMoneyLog(0,$v['userId'],0,2,'预获优惠券转换所得',1,$personAlreadyCouponsNum,'dayPay',2); $data['alreadyCouponsNum'] = $v['alreadyCouponsNum'] + $personAlreadyCouponsNum;//已获优惠券加 } $data['isGive'] = 1; @@ -128,7 +130,8 @@ class UserVouchers extends Base{ $data['giveDay'] = $v['giveDay'] + 1; $m->updateInfo(['id'=>$v['id']],$data); } - + Db::commit(); + Db::startTrans(); // 每次所得值（费、税前）同时扣减“助购预获”值和“预获产品券”值，直至减为负数为止，负数部分按每天0.1%耗损。 // A、当“助购预获”值为负数时，每天0.1%耗损在“预获产品券”值扣减。 // B、当“预获产品券”值为负数时，每天0.1%耗损在“预获优惠券”值扣减。