Merge branch 'master' of https://git.bjtdba.com/shop/php

app/controller/api/store/merchant/TaskPartnerProfits.php

@@ -207,11 +207,12 @@ class TaskPartnerProfits
                 $subordinatesBatch = $this->getSubordinatesBatch($spreadUserUidList[$v]);
                 // 6.2.3 获取所有部门（下线）的PV值
                 foreach ($subordinatesBatch as $k1 => $v1) {
+                    $partnerProfitsPvListByUid[$v][$k1] = 0;
                     // 获取当前下线的PV值, 忽略测试人员的账号
                     $pv = $this->getPv(array_merge($v1, [$k1]), $removeUserIdList);
-                    if (!empty($pv)) {
-                        $partnerProfitsPvListByUid[$v][$k1] = $pv;
-                    }
+                    $partnerProfitsPvListByUid[$v][$k1] += $pv;
+                    $pvNew = $this->getPvNew(array_merge($v1, [$k1]), $removeUserIdList);
+                    $partnerProfitsPvListByUid[$v][$k1] += $pvNew;
                 }
 
                 // 6.2.4 将PV值进行记录 以便后续计算
@@ -595,6 +596,44 @@ class TaskPartnerProfits
         }
         return $money1180Sum + $money11800Sum + $money10620Sum + $money9440Sum + $money2360Sum + (floor($otherMoneySum * 70) / 100);
     }
+    // 获取用户PV值
+    public function getPvNew($userIdList, $removeUserIdList = [])
+    {
+        if (!empty($removeUserIdList)) {
+            $userIdList = array_values(array_diff($userIdList, $removeUserIdList));
+        }
+        // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
+        $orders = Db::name("store_order")
+            ->where('mer_id', 496)
+            ->whereIn('uid', $userIdList)
+            ->whereIn('status', [0, 1, 2, 3]) // TODO 之前橙汁先生 这么定义的，感觉有问题，也就是现在 会员专区 下单 不允许退款，不然肯定有问题 注意调整
+            ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
+            ->whereNotNull("pay_time") // 排除 pay_time 为 NULL 的订单
+            ->select();
+
+        // 计算总业绩
+        $totalPv = 0;
+        foreach ($orders as $order) {
+            switch ($order['total_price']) {
+                case 1180:
+                    $totalPv += 700;
+                    break;
+                case 11800:
+                    $totalPv += 7000;
+                    break;
+                case 10620:
+                    $totalPv += 6300;
+                    break;
+                case 2360:
+                    $totalPv += 1400;
+                    break;
+                case 9440:
+                    $totalPv += 5600;
+                    break;
+            }
+        }
+        return $totalPv;
+    }
 
     //发放佣金 示例: $this->change_user_log($v,'amount',1,$all_award,"member_award","星级分红入账"."-".$value['title']);//释放佣金
     function change_user_log($user_id, $type, $change_status, $money, $routine, $remark = "", $is_admin = 1, $appoint_money = 0)