From 275943ff786c5b08e3cacda7ff28fa5dc295db57 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Sun, 27 Oct 2019 22:57:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=8A=A0=E5=88=B8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- H5B854518.wgt | Bin 7870415 -> 7870420 bytes get_version_new.php | 2 +- hyhproject/common/model/Orders.php | 2 -- hyhproject/common/model/Settlements.php | 6 +++++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/H5B854518.wgt b/H5B854518.wgt index 2bd177f47e272852647e120cc88193a473219386..d9db91df5182e0b42fd78fb4aacdec564a47c30a 100644 GIT binary patch delta 12984 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 delta 12873 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 E19L^I*8l(j diff --git a/get_version_new.php b/get_version_new.php index 3254eb0..9592759 100755 --- a/get_version_new.php +++ b/get_version_new.php @@ -2,7 +2,7 @@ $data['version'] = 16; $data['ios_must_update'] = 0; //是否强制更新,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['ios_version'] = '1.0.0'; $data['ios_appid'] = '1355322179'; diff --git a/hyhproject/common/model/Orders.php b/hyhproject/common/model/Orders.php index 0826a7e..046056b 100755 --- a/hyhproject/common/model/Orders.php +++ b/hyhproject/common/model/Orders.php @@ -1533,8 +1533,6 @@ class Orders extends Base{ // 10000×0.4×0.5×0.5=1000“预获优惠券”。 $vm->insertHelpSaleNotice($userId, $orderId, $order['goodsMoney']*((int)$order["helpUserLevel"])*(float)dataConf("helpSaleCalBase"), '交易订单【'.$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“预获产品券”; // 当消费低于限制值时10000×0.4×0.5×0.2=400“预获产品券”。 diff --git a/hyhproject/common/model/Settlements.php b/hyhproject/common/model/Settlements.php index e73c178..27b89c8 100755 --- a/hyhproject/common/model/Settlements.php +++ b/hyhproject/common/model/Settlements.php @@ -47,7 +47,11 @@ class Settlements extends Base // $buyerPreProductNum += round($order->couponsHandlingFee * (dataConf('buyerPreProductInProductHandlingFeeScale')*0.01),2);//5 // $buyerPreProductNum += round($order->couponsTaxFee * (dataConf('buyerPreProductInProductTaxFeeScale')*0.01),2);//6 if($buyerPreProductNum >= 0.01 || $buyerPreCoupousNum>=0.01){ - Model('common/UserVouchers')->insertVouchersNotice($order->userId,$orderId,$buyerPreProductNum,$buyerPreCoupousNum,'交易订单【'.$order->orderNo.'】购户购物所得'); + 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.'】购户购物所得'); + } } }