diff --git a/H5B854518.wgt b/H5B854518.wgt index 2bd177f..d9db91d 100644 Binary files a/H5B854518.wgt and b/H5B854518.wgt differ 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.'】购户购物所得'); + } } }