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 2019-10-27 22:57:57 +08:00
parent c7105781fb
commit 275943ff78
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
H5B854518.wgt
View File

Binary file not shown.

2
get_version_new.php
View File

@ -2,7 +2,7 @@
$data['version'] = 16; $data['version'] = 16;
$data['ios_must_update'] = 0; //是否强制更新,0不强制,1强制 $data['ios_must_update'] = 0; //是否强制更新,0不强制,1强制
$data['must_update'] = 1; //是否强制更新,0不强制,1强制 $data['must_update'] = 1; //是否强制更新,0不强制,1强制
$data['apk_version'] = '2.2.2'; $data['apk_version'] = '2.2.3';
$data['apk_down_url'] = 'http://www.zgqlg.com.cn/H5B854518.wgt'; $data['apk_down_url'] = 'http://www.zgqlg.com.cn/H5B854518.wgt';
//$data['ios_version'] = '1.0.0'; //$data['ios_version'] = '1.0.0';
$data['ios_appid'] = '1355322179'; $data['ios_appid'] = '1355322179';

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

@ -1533,8 +1533,6 @@ class Orders extends Base{
// 10000×0.4×0.5×0.5=1000“预获优惠券”。 // 10000×0.4×0.5×0.5=1000“预获优惠券”。
$vm->insertHelpSaleNotice($userId, $orderId, $order['goodsMoney']*((int)$order["helpUserLevel"])*(float)dataConf("helpSaleCalBase"), $vm->insertHelpSaleNotice($userId, $orderId, $order['goodsMoney']*((int)$order["helpUserLevel"])*(float)dataConf("helpSaleCalBase"),
'交易订单【'.$order['orderNo'].'】购户购物所得', 1); '交易订单【'.$order['orderNo'].'】购户购物所得', 1);
$vm->insertVouchersNotice($userId, $orderId, $order['goodsMoney'], $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*(1-((float)dataConf("helpSaleChildrenGet")/100)),
'您的订单编号'.$order['orderNo'].'完成添加',1);
// step 6 平台送自己的推荐人：当消费超过限制值时10000×0.4×0.5×0.5=1000“预获产品券”； // step 6 平台送自己的推荐人：当消费超过限制值时10000×0.4×0.5×0.5=1000“预获产品券”；
// 当消费低于限制值时10000×0.4×0.5×0.2=400“预获产品券”。 // 当消费低于限制值时10000×0.4×0.5×0.2=400“预获产品券”。

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

@ -47,9 +47,13 @@ class Settlements extends Base
// $buyerPreProductNum += round($order->couponsHandlingFee * (dataConf('buyerPreProductInProductHandlingFeeScale')*0.01),2);//5 // $buyerPreProductNum += round($order->couponsHandlingFee * (dataConf('buyerPreProductInProductHandlingFeeScale')*0.01),2);//5
// $buyerPreProductNum += round($order->couponsTaxFee * (dataConf('buyerPreProductInProductTaxFeeScale')*0.01),2);//6 // $buyerPreProductNum += round($order->couponsTaxFee * (dataConf('buyerPreProductInProductTaxFeeScale')*0.01),2);//6
if($buyerPreProductNum >= 0.01 || $buyerPreCoupousNum>=0.01){ 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.'】购户购物所得');
}else{
Model('common/UserVouchers')->insertVouchersNotice($order->userId,$orderId,$buyerPreProductNum,$buyerPreCoupousNum,'交易订单【'.$order->orderNo.'】购户购物所得'); Model('common/UserVouchers')->insertVouchersNotice($order->userId,$orderId,$buyerPreProductNum,$buyerPreCoupousNum,'交易订单【'.$order->orderNo.'】购户购物所得');
} }
} }
}
// 商户的所得分配 // 商户的所得分配