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

Merge branch 'test'

Browse Source
This commit is contained in:
Jerry Yan 2020-08-26 22:19:35 +08:00
commit 45014bce8d
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,9 +26,7 @@ class Settlements extends Base
}
$discountMoney = round($discountMoney,2);
//加入快代付值
$fastScale = dataConf('fastPayInSaleScale');
$fastNum = round($discountMoney * ($fastScale*0.01),5);
Model('SysSummary')->addToPayFast($orderId,$fastNum,$fastScale,'订单【'.($order['orderNo']?:'--').'】优惠款加入');
Model('SysSummary')->addToPayFast($orderId,$discountMoney,'订单【'.($order['orderNo']?:'--').'】优惠款加入');
//获取产品额
$totalMoney = $order->realTotalMoney;//产品额
if(2 != $order->goodsType){//助微吧商品不给购户券值

19
hyhproject/common/model/SysSummary.php
View File

@ -6,15 +6,21 @@ use think\Db;
* 系统数据
*/
class SysSummary extends Base{
public function addToPayFast($orderId,$payFastNum,$fastScale,$sm=''){
public function addToPayFast($orderId,$money,$sm=''){
$fastScale = dataConf('fastPayInSaleScale');
$slowScale = dataConf('slowPayInSaleScale');
$payFastNum = round($money * ($fastScale*0.01),5);
$paySlowNum = round($money * ($slowScale*0.01),5);
$noticeData['orderId'] = $orderId;
$noticeData['toPayFast'] = $payFastNum;
$noticeData['fastScale'] = $fastScale;
$noticeData['slowScale'] = $slowScale;
$noticeData['desc'] = $sm;
$noticeData['createTime'] = time();
Db::name('sys_notice')->insert($noticeData);
// 原：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代快付值
// 改为：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代慢付值
$this->addSysSummary($payFastNum, 0, 1,$sm);
$this->addSysSummary($payFastNum, $paySlowNum, 1,$sm);
}
/**
* 添加系统数据
@ -24,6 +30,11 @@ class SysSummary extends Base{
*/
public function addSysSummary($payFastNum=0,$payFastSlow=0,$isAdd=1,$sm=''){
if($payFastNum){
if ($payFastNum < 0) {
$payFastNum = abs($payFastNum);
$payFastSlow = 0 - ($payFastSlow);
$isAdd = ($isAdd + 1) % 2;
}
$this->addSysLog($payFastNum,1,$isAdd,$sm);
if(1 == $isAdd){
$this->where(['id'=>1])->setInc('toPayFast',$payFastNum);
@ -32,6 +43,10 @@ class SysSummary extends Base{
}
}
if($payFastSlow){
if ($payFastSlow < 0) {
$payFastSlow = abs($payFastSlow);
$isAdd = ($isAdd + 1) % 2;
}
$this->addSysLog($payFastSlow,2,$isAdd,$sm);
if(1 == $isAdd){
$this->where(['id'=>1])->setInc('toPaySlow',$payFastSlow);

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

@ -53,6 +53,8 @@ class UserVouchers extends Base{
$sm->addSysSummary(0,$addPaySlow,1,'应释放总额大于最大释放总额');
}
//扣减系统释放值
if ($paySlow < 0) $paySlow = 0;
if ($payFast < 0) $payFast = 0;
$sm->addSysSummary($payFast,$paySlow,2,'扣减系统释放值');
//取最小值作为总释放额
$payNum = min($maxPayNum,$toPaySum);