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-07-05 14:48:20 +08:00
commit 00ff3ae2df
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -14,7 +14,7 @@ class SysSummary extends Base{
Db::name('sys_notice')->insert($noticeData); Db::name('sys_notice')->insert($noticeData);
// 原：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代快付值 // 原：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代快付值
// 改为：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代慢付值 // 改为：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代慢付值
$this->addSysSummary($payFastNum, 0,$sm); $this->addSysSummary($payFastNum, 0, 1,$sm);
} }
/** /**
* 添加系统数据 * 添加系统数据