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-13 21:57:58 +08:00
commit 902eed095d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1511,7 +1511,7 @@ class Orders extends Base{
// step 2 商户支付优惠款给平台：10000×0.4=4000 // step 2 商户支付优惠款给平台：10000×0.4=4000
// 10.15添加 优惠款 全额进入 代快付值 // 10.15添加 优惠款 全额进入 代快付值
// 20.06.29 优惠款 90%进入 代快付值 // 20.06.29 优惠款 90%进入 代快付值
$sm->addSysSummary($calBaseNum*0.9,0,1,'助购吧购物,订单号ID['.$orderId.'],优惠款90%进入代快付值'); // $sm->addSysSummary($calBaseNum*0.9,0,1,'助购吧购物,订单号ID['.$orderId.'],优惠款90%进入代快付值');
$vm = new UserVouchers(); $vm = new UserVouchers();
@ -1528,7 +1528,7 @@ class Orders extends Base{
if((int)$order["helpUserLevel"]!==0){ if((int)$order["helpUserLevel"]!==0){
$vm->insertHelpSaleNotice($order["helpUserId"], $orderId, $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100), $vm->insertHelpSaleNotice($order["helpUserId"], $orderId, $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100),
'预获助购转换所扣', 0); '预获助购转换所扣', 0);
$sm->addSysSummary($calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100),0,2,'订单ID['.$orderId.']:平台送给购户的上N层用户ID['.$order["helpUserId"].']'); $sm->addSysSummary($calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100),0,2,'订单【'.$order['orderNo'].'】被助购转换所扣');
$vm->insertVouchersNotice($order['helpUserId'], $orderId, $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100), 0, $vm->insertVouchersNotice($order['helpUserId'], $orderId, $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100), 0,
'预获产品券转换所扣',0); '预获产品券转换所扣',0);
$vm->insertAlreadyVouchersNotice($order['helpUserId'], $orderId, $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100), 0, $vm->insertAlreadyVouchersNotice($order['helpUserId'], $orderId, $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100), 0,

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,'订单【'.$order['orderNo'].'】优惠款加入');
//获取产品额 //获取产品额
$totalMoney = $order->realTotalMoney;//产品额 $totalMoney = $order->realTotalMoney;//产品额
if(2 != $order->goodsType){//助微吧商品不给购户券值 if(2 != $order->goodsType){//助微吧商品不给购户券值