From 6acde199d729f3ac71385242af52654af6cc629f Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 13 Oct 2020 23:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=A0=91=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=BE=97=E9=A2=84=E8=8E=B7?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=88=B8=E5=8D=A0=E4=BC=98=E6=83=A0=E6=AC=BE?=
 =?UTF-8?q?=EF=BC=8C=E5=8A=A9=E8=B4=AD=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 H5436787D.wgt                            | Bin 7874664 -> 7874657 bytes
 get_version_new.php                      |   4 +--
 hyhproject/app/controller/UserLevel.php  |   4 +--
 hyhproject/common/model/Orders.php       |  32 +++++++++++++++++------
 hyhproject/common/model/UserVouchers.php |   2 +-
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/H5436787D.wgt b/H5436787D.wgt
index 4872767baf392a4d79d6e889b981ac9eaec94ff7..9924a01edc5d76ea835cc372b91334156132bc46 100644
GIT binary patch
delta 5347
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
Q2!9A~eHMo!<k2DbA0#<6<NyEw

delta 5373
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
K9aA0|F8vq%;Wi!s

diff --git a/get_version_new.php b/get_version_new.php
index 2b7c9c6..120dbb6 100755
--- a/get_version_new.php
+++ b/get_version_new.php
@@ -1,8 +1,8 @@
 <?php
-$data['version'] = 16;
+$data['version'] = 90;
 $data['ios_must_update'] = 1;	//是否强制更新,0不强制,1强制
 $data['must_update'] = 1;	//是否强制更新,0不强制,1强制
-$data['apk_version'] = '2.3.9';
+$data['apk_version'] = '2.4.0';
 $data['apk_down_url'] = 'http://www.zgqlg.com.cn/H5436787D.wgt';
 //$data['ios_version'] = '1.0.0';
 $data['ios_appid'] = '1355322179';
diff --git a/hyhproject/app/controller/UserLevel.php b/hyhproject/app/controller/UserLevel.php
index a436e5b..e2436bf 100755
--- a/hyhproject/app/controller/UserLevel.php
+++ b/hyhproject/app/controller/UserLevel.php
@@ -48,15 +48,13 @@ class UserLevel extends Base
         $userId   = get_my_id();
         $treeArr  = [];
         $goodsType = 3;
-        $min = Db::name('orders')->where(compact('userId','goodsType'))->min('helpUserLevel');
-        if(0 == $min){$min = 1;}
         $max = Db::name('orders')->where(compact('userId','goodsType'))->max('helpUserLevel');
         $newLevel = 0;
         do {
             $newLevel++;
             $userId = UT::getUpperId($userId);// 找到我的层级
             if ($userId == null) $userId = 1;// 上级uid
-            if (($newLevel >= $min) && UT::checkUserCanDisplay($userId)) {// 如果有，则使用上级信息
+            if (UT::checkUserCanDisplay($userId)) {// 如果有，则使用上级信息
                 if($newLevel>10){
                     $treeArr[$newLevel]['level'] = "第".$newLevel."层";
                 }else{
diff --git a/hyhproject/common/model/Orders.php b/hyhproject/common/model/Orders.php
index 9f1ba13..ce006a6 100755
--- a/hyhproject/common/model/Orders.php
+++ b/hyhproject/common/model/Orders.php
@@ -1466,6 +1466,9 @@ class Orders extends Base{
 					}
                     $m = Model('common/Table');
                     $userInfo = getUserInfo(['userId'=>$userId],'userName,userType,buyHelpMoney,helpMaxSaleMoney');
+                    // 计算 SUM(商品*优惠率) 的值
+                    $calBaseNum = Db::table("__ORDERS__ o")->join("__ORDER_GOODS__ g", "g.orderId=o.orderId", 'inner')
+                        ->where(['o.orderId'=>$orderId])->sum('g.goodsPrice*g.goodsNum*g.discountRate*0.01');
 					if (2 == $order['goodsType']){//助微吧购物
 						if (1 == $userInfo['userType']){//是商户购物
 							//加助微吧购物金额
@@ -1501,9 +1504,6 @@ class Orders extends Base{
 						}
 					}
 					elseif (3 == $order['goodsType']){//助购吧购物
-                        // 计算 SUM(商品*优惠率) 的值
-                        $calBaseNum = Db::table("__ORDERS__ o")->join("__ORDER_GOODS__ g", "g.orderId=o.orderId", 'inner')
-                            ->where(['o.orderId'=>$orderId])->sum('g.goodsPrice*g.goodsNum*g.discountRate*0.01');
 //                        foreach ($orderGoods as $orderGood) {
 //                            // 在不考虑数据库变更的情况下，这两个值都是存储的数字类型，所以不做特殊处理
 //                            $calBaseNum += (float)$orderGood['goodsPrice'] * (float)$orderGood['discountRate'] / 100;
@@ -1523,8 +1523,13 @@ class Orders extends Base{
                         // step 5 平台送自己：10000×N“助购预获”，
                         //                   10000“预获产品券”；
                         //                   10000×0.4×0.5×0.5=1000“预获优惠券”。
-                        $vm->insertHelpSaleNotice($userId, $orderId, $order['goodsMoney']*((int)$order["helpUserLevel"])*(float)dataConf("helpSaleCalBase"),
-                            '交易订单【'.$order['orderNo'].'】购户购物所得', 1);
+                        if ((int)$order["helpUserLevel"] === 1) {
+                            $vm->insertHelpSaleNotice($userId, $orderId, $order['goodsMoney']*((int)$order["helpUserLevel"]),
+                                '交易订单【'.$order['orderNo'].'】购户购物所得', 1);
+                        } else {
+                            $vm->insertHelpSaleNotice($userId, $orderId, $order['goodsMoney']*((int)$order["helpUserLevel"])*(float)dataConf("helpSaleCalBase"),
+                                '交易订单【'.$order['orderNo'].'】购户购物所得', 1);
+                        }
 
                         // step 8 平台送自己的上第N层：扣减“助购预获”、“预获产品券”各10000×0.4×0.5=2000，
                         //                            同时添加10000×0.4×0.5=2000“已获产品券”。
@@ -1556,12 +1561,23 @@ class Orders extends Base{
                         }
 
                         // 10.15添加：助购户的 助购预获 减少的同时 代快付值等额减少
+                        if ((int)$order["helpUserLevel"] === 1) {
                         Db::name("orders")->where(compact('orderId'))->update([
-                            "helpGetCount"=>$order['goodsMoney']*((int)$order["helpUserLevel"])*(float)dataConf("helpSaleCalBase"),
+                            "helpGetCount"=>$order['goodsMoney']*((int)$order["helpUserLevel"]),
                             "helpGetCount2"=>$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100),
-                        ]);
+                        ]);}
+                        else {
+                            Db::name("orders")->where(compact('orderId'))->update([
+                                "helpGetCount"=>$order['goodsMoney']*((int)$order["helpUserLevel"])*(float)dataConf("helpSaleCalBase"),
+                                "helpGetCount2"=>$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100),
+                            ]);
+                        }
                     }
-					//新增订单日志
+                    $vm = new UserVouchers();
+                    $vm->insertVouchersNotice($userId, $orderId, $calBaseNum*((float)dataConf('couponPercentCanUsetGet')/100), 0,
+                        '交易订单【'.$order['orderNo'].'】购户从优惠款中获得',1);
+
+                    //新增订单日志
 					$logOrder = [];
 					$logOrder['orderId'] = $orderId;
 					$logOrder['orderStatus'] = 2;
diff --git a/hyhproject/common/model/UserVouchers.php b/hyhproject/common/model/UserVouchers.php
index 3cec37d..ca4dd60 100755
--- a/hyhproject/common/model/UserVouchers.php
+++ b/hyhproject/common/model/UserVouchers.php
@@ -149,7 +149,7 @@ class UserVouchers extends Base{
                 }else{
                     $count = (float)$_each["helpSaleNum"];
                     model('common/UserVouchers')->insertVouchersNotice($_each["userId"], 0, $count*((float)dataConf("deductionRateWhennegPreCoupons")/100),
-                        0, "助购预获为负，每天耗损预获产品券", 0);
+                        0, "助购券为负，每天耗损预获产品券", 0);
                 }
             }
             Db::commit();