From ac667a26c70c4d04193a854ebdb2e0a52de14280 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Wed, 30 Oct 2019 22:30:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=8E=A8=E8=8D=90=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=EF=BC=8C=E6=88=91=E6=8E=A8=E8=8D=90=E7=9A=84=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=95=86=E6=88=B7=E7=9A=84=E9=80=81=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/common/model/Orders.php      | 35 -------------------
 hyhproject/common/model/Settlements.php | 45 ++++++++++++++++++++++---
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/hyhproject/common/model/Orders.php b/hyhproject/common/model/Orders.php
index 19308c8..4621ddd 100755
--- a/hyhproject/common/model/Orders.php
+++ b/hyhproject/common/model/Orders.php
@@ -1514,19 +1514,6 @@ class Orders extends Base{
                         $vm = new UserVouchers();
 
 
-                        // step 4 平台送商户的推荐人：当消费超过限制值时10000×0.4×0.5×0.5=1000“预获产品券”。
-                        //                           当消费低于限制值时10000×0.4×0.5×0.2=400“预获产品券”。
-                        $uUserId = UserTrees::getUpperId($order["sUserId"]);
-                        if($uUserId == null || $uUserId = 0){$uUserId = 1;}
-                        $data = Db::query('SELECT count(`goodsMoney`) as `total` FROM `hyh_orders` WHERE DATE_FORMAT(`createTime`,"%Y%m%d")=DATE_FORMAT(DATE_SUB(now(),INTERVAL 1 day),"%Y%m%d") and `userId`="'.$uUserId.'"');
-                        // 因为count一定会有数据所以不判断了
-                        if($data[0]["total"]<=dataConf("refPreProductYdGTMoney")){
-                            $vm->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductNoInSaleScale")/100),
-                                0,'交易订单【'.$order['orderNo'].'】推荐商户所得',1);
-                        }else{
-                            $vm->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductYesInSaleScale ")/100),
-                                0,'交易订单【'.$order['orderNo'].'】推荐商户所得',1);
-                        }
 
                         // step 5 平台送自己：10000×N“助购预获”，
                         //                   10000“预获产品券”；
@@ -1534,28 +1521,6 @@ class Orders extends Base{
                         $vm->insertHelpSaleNotice($userId, $orderId, $order['goodsMoney']*((int)$order["helpUserLevel"])*(float)dataConf("helpSaleCalBase"),
                             '交易订单【'.$order['orderNo'].'】购户购物所得', 1);
 
-                        // step 6 平台送自己的推荐人：当消费超过限制值时10000×0.4×0.5×0.5=1000“预获产品券”；
-                        //                           当消费低于限制值时10000×0.4×0.5×0.2=400“预获产品券”。
-                        $uUserId = UserTrees::getUpperId($userId);
-                        if($uUserId === null){$uUserId = 1;}
-                        $data = Db::query('SELECT count(`goodsMoney`) as `total` FROM `hyh_orders` WHERE DATE_FORMAT(`createTime`,"%Y%m%d")=DATE_FORMAT(DATE_SUB(now(),INTERVAL 1 day),"%Y%m%d") and `userId`="'.$uUserId.'"');
-                        // 因为count一定会有数据所以不判断了
-                        if($data[0]["total"]<=dataConf("refPreProductYdGTMoney")){
-                            $vm->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductNoInSaleScale")/100),
-                                0,'交易订单【'.$order['orderNo'].'】推荐购户所得',1);
-                        }else{
-                            $vm->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductYesInSaleScale ")/100),
-                                0,'交易订单【'.$order['orderNo'].'】推荐购户所得',1);
-                        }
-
-                        // step 7 平台送自己的被推荐人：10000×0.4×0.5×0.5÷5=200“预获产品券”。
-                        $childes = DB::table("hyh_user_trees")->where(["pid"=>$userId])->field("uid")->select();
-                        foreach ($childes as $child){
-                            $vm->insertVouchersNotice($child['uid'], $orderId,
-                                $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("helpSaleChildrenGet")/100)/sizeof($childes), 0,
-                                '交易订单【'.$order['orderNo'].'】被推荐所得',1);
-                        }
-
                         // step 8 平台送自己的上第N层：扣减“助购预获”、“预获产品券”各10000×0.4×0.5=2000，
                         //                            同时添加10000×0.4×0.5=2000“已获产品券”。
                         if((int)$order["helpUserLevel"]!==0){
diff --git a/hyhproject/common/model/Settlements.php b/hyhproject/common/model/Settlements.php
index 954cc24..a38c079 100755
--- a/hyhproject/common/model/Settlements.php
+++ b/hyhproject/common/model/Settlements.php
@@ -63,21 +63,56 @@ class Settlements extends Base
         // $discountMoney-$order->productNum-$order->couponsNum-$order->wangNum-$order->moneyNum
         $sellerPreProductNum = round($discountMoney * (dataConf('sellerPreProductInProductScale')*0.01),2);//1
         $sellerPreCoupousNum = round($discountMoney * (dataConf('sellerPreCoupousInSaleScale')*0.01),2);//2
+        $calBaseNum = Db::table("__ORDERS__ o")->join("__ORDER_GOODS__ g", "g.orderId=o.orderId", 'inner')
+            ->where(['o.orderId'=>$orderId])
+            ->sum('g.goodsPrice*g.discountRate*0.01');
         if($sellerPreProductNum >= 0.01 || $sellerPreCoupousNum>=0.01){
             if(3 != $order->goodsType){
                 // step 3 平台送商户：10000×0.4=4000“预获产品券”
                 //                   10000×0.4=4000“预获优惠券”
-                $calBaseNum = Db::table("__ORDERS__ o")->join("__ORDER_GOODS__ g", "g.orderId=o.orderId", 'inner')
-                    ->where(['o.orderId'=>$orderId])
-                    ->sum('g.goodsPrice*g.discountRate*0.01');
                 Model('common/UserVouchers')->insertVouchersNotice($shops['userId'], $orderId, $calBaseNum, $calBaseNum,
                     '交易订单【'.$order->orderNo.'】商户售物所得',1);
             }else{
                 Model('common/UserVouchers')->insertVouchersNotice($shops['userId'],$orderId,$sellerPreProductNum,$sellerPreCoupousNum,'交易订单【'.$order->orderNo.'】商户售物所得');
             }
         }
-        
-       
+
+        // step 4 平台送商户的推荐人：当消费超过限制值时10000×0.4×0.5×0.5=1000“预获产品券”。
+        //                           当消费低于限制值时10000×0.4×0.5×0.2=400“预获产品券”。
+        $uUserId = UserTrees::getUpperId($shops["userId"]);
+        if($uUserId == null || $uUserId = 0){$uUserId = 1;}
+        $data = Db::query('SELECT count(`goodsMoney`) as `total` FROM `hyh_orders` WHERE DATE_FORMAT(`createTime`,"%Y%m%d")=DATE_FORMAT(DATE_SUB(now(),INTERVAL 1 day),"%Y%m%d") and `userId`="'.$uUserId.'"');
+        // 因为count一定会有数据所以不判断了
+        if($data[0]["total"]<=dataConf("refPreProductYdGTMoney")){
+            Model('common/UserVouchers')->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductNoInSaleScale")/100),
+                0,'交易订单【'.$order['orderNo'].'】推荐商户所得',1);
+        }else{
+            Model('common/UserVouchers')->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductYesInSaleScale ")/100),
+                0,'交易订单【'.$order['orderNo'].'】推荐商户所得',1);
+        }
+        // step 6 平台送自己的推荐人：当消费超过限制值时10000×0.4×0.5×0.5=1000“预获产品券”；
+        //                           当消费低于限制值时10000×0.4×0.5×0.2=400“预获产品券”。
+        $uUserId = UserTrees::getUpperId($order['userId']);
+        if($uUserId === null){$uUserId = 1;}
+        $data = Db::query('SELECT count(`goodsMoney`) as `total` FROM `hyh_orders` WHERE DATE_FORMAT(`createTime`,"%Y%m%d")=DATE_FORMAT(DATE_SUB(now(),INTERVAL 1 day),"%Y%m%d") and `userId`="'.$uUserId.'"');
+        // 因为count一定会有数据所以不判断了
+        if($data[0]["total"]<=dataConf("refPreProductYdGTMoney")){
+            Model('common/UserVouchers')->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductNoInSaleScale")/100),
+                0,'交易订单【'.$order['orderNo'].'】推荐购户所得',1);
+        }else{
+            Model('common/UserVouchers')->insertVouchersNotice($uUserId, $orderId,$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("refPreProductYesInSaleScale ")/100),
+                0,'交易订单【'.$order['orderNo'].'】推荐购户所得',1);
+        }
+        // step 7 平台送自己的被推荐人：10000×0.4×0.5×0.5÷5=200“预获产品券”。
+        $childes = DB::table("hyh_user_trees")->where(["pid"=>$order['userId']])->field("uid")->select();
+        foreach ($childes as $child){
+            Model('common/UserVouchers')->insertVouchersNotice($child['uid'], $orderId,
+                $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100)*((float)dataConf("helpSaleChildrenGet")/100)/sizeof($childes), 0,
+                '交易订单【'.$order['orderNo'].'】被推荐所得',1);
+        }
+
+
+
         //旺旺券结算
         $payVouchersNum = ($order->productNum - $order->productHandlingFee - $order->productTaxFee) + ($order->couponsNum - $order->couponsHandlingFee - $order->couponsTaxFee) + $order->wangNum;////3个券的付款总额+$order->moneyNum;
         $giveWangNum = round($payVouchersNum - $discountMoney,2);