Merge branch 'master' into huangfamily

app/command/PensionTasks.php

@@ -12,6 +12,7 @@ use app\common\repositories\merchant\order\OrderMerchantRepository;
 use app\common\repositories\store\order\StoreOrderStatusRepository;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\user\UserBillRepository;
+use app\common\repositories\user\UserRepository;
 use app\traits\GzcApiRequest;
 use Carbon\Carbon;
 use think\console\Command;
@@ -524,6 +525,9 @@ class PensionTasks extends Command
                             'status'          => 1,
                             'settlement_time' => date('Y-m-d H:i:s')
                         ]);
+                    /** @var UserRepository $userRepository */
+                    $userRepository = app()->make(UserRepository::class);
+                    $userRepository->setUserIdentity($user_sign_gongxian['uid']);
                 }
 
             });
@@ -772,6 +776,33 @@ class PensionTasks extends Command
                             'status'          => 1,
                             'settlement_time' => date('Y-m-d H:i:s')
                         ]);
+                    /** @var UserRepository $userRepository */
+                    $userRepository = app()->make(UserRepository::class);
+                    $userRepository->setUserIdentity($user_sign_gongxian['uid']);
+                }
+
+                // 结算PV值
+                $user_pv_list = Db::name('user_pv_log')
+                    ->where('status', -1)
+                    ->where('order_id', $online['order_id'])
+                    ->whereIn('type', [1, 2])
+                    ->select()
+                    ->toArray();
+                if($user_pv_list) {
+                    foreach ($user_pv_list as $user_pv) {
+                        // 修改pv
+                        Db::name('user')
+                            ->where('uid', $user_pv['uid'])
+                            ->inc('pv', (float)$user_pv['pv'])
+                            ->update();
+                        Db::name('user_pv_log')
+                            ->where('status', -1)
+                            ->where('id', $user_pv['id'])
+                            ->update([
+                                'status'          => 1,
+                                'settlement_time' => date('Y-m-d H:i:s')
+                            ]);
+                    }
                 }
 
                 

app/command/TaskDividendCommand.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace app\command;
+
+use app\controller\api\store\merchant\Taskorderguquan;
+use app\controller\api\store\merchant\Taskorderlianc;
+use app\controller\api\store\merchant\TaskPartnerProfits;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+
+class TaskDividendCommand extends Command
+{
+    protected function configure()
+    {
+        // 配置命令名称及描述
+        $this->setName('TaskDividendCommand')
+            ->setDescription('分红任务');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        // 在这里执行任务的具体内容
+        $output->writeln('定时任务执行中...');
+
+        // 合伙人分红
+        /** @var TaskPartnerProfits $taskPartnerProfits */
+        $taskPartnerProfits = app()->make(TaskPartnerProfits::class);
+        $taskPartnerProfits->partnerProfits();
+
+        // 股份分红
+        /** @var Taskorderguquan $taskorderguquan */
+        $taskorderguquan = app()->make(Taskorderguquan::class);
+        $taskorderguquan->lst6();
+
+        // 联创分红
+        /** @var Taskorderlianc $taskorderlianc */
+        $taskorderlianc = app()->make(Taskorderlianc::class);
+        $taskorderlianc->lst2();
+
+        $output->writeln('定时任务执行完成');
+    }
+}

app/common/dao/user/UserIdentityDao.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-05-07
+ *
+ * 
+ */
+
+namespace app\common\dao\user;
+
+
+use app\common\dao\BaseDao;
+use app\common\model\BaseModel;
+use app\common\model\user\UserIdentity;
+use think\db\BaseQuery;
+
+/**
+ * Class UserIdentityDao
+ * @package app\common\dao\user
+ */
+class UserIdentityDao extends BaseDao
+{
+
+    /**
+     * @return BaseModel
+     * @author xaboy
+     * @day 2020-03-30
+     */
+    protected function getModel(): string
+    {
+        return UserIdentity::class;
+    }
+
+
+    /**
+     * @param array $where
+     * @return BaseQuery
+     * @author xaboy
+     * @day 2020-05-06
+     */
+    public function search(array $where = [])
+    {
+        return UserIdentity::getDB();
+    }
+
+}

app/common/model/user/UserIdentity.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-05-07
+ *
+ * 
+ */
+
+namespace app\common\model\user;
+
+
+use app\common\model\BaseModel;
+
+class UserIdentity extends BaseModel
+{
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2020-03-30
+     */
+    public static function tablePk(): string
+    {
+        return 'user_group_id';
+    }
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2020-03-30
+     */
+    public static function tableName(): string
+    {
+        return 'user_identity';
+    }
+}

app/common/repositories/store/order/StoreOrderRepository.php

@@ -694,7 +694,7 @@ class StoreOrderRepository extends BaseRepository
 //                         $mer_money += $moneys - $total_extension_one - $souxufees;
 //                         if ($cartInfo['mer_id'] == 290) {
 //                             $moneys = bcsub($moneys, $souxufees, 3);
-//                             $moneys = round($moneys, 2); 
+//                             $moneys = round($moneys, 2);
 //                             $total_extension_one = bcmul($moneys, '0.52', 3);
 //                             $total_extension_one = round($total_extension_one, 2);
 //                             $mer_money = bcmul($moneys, '0.40', 3);
@@ -3804,6 +3804,9 @@ class StoreOrderRepository extends BaseRepository
                 $yongjinbili = 17;
             }
 
+            $yongjin = $pvfee * $yongjinbili / 100;
+            // 佣金百分之90进入佣金池
+            // $tuiguanyongjin = round($yongjin * 0.9, 2);
             $tuiguanyongjin = bcmul($pvfee, $yongjinbili / 100, 2);
 
 
@@ -3819,6 +3822,21 @@ class StoreOrderRepository extends BaseRepository
                 Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
             }
 
+            if($yongjin >= 0.1){
+                // 佣金百分之10进入复购金
+                $orderThird = app()->make(UserThirdRepository::class);
+                //复购金
+                $orderThird->yuguFugou(
+                    $yongjin,
+                    $sprerdUser["uid"],
+                    $order_sn,
+                    $order["type_shop"]
+                );
+            } else {
+                Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，复购金低于0.01无法入库 特此记录！']);
+            }
+
+
         }
         //end存养老金
 
@@ -6715,7 +6733,7 @@ class StoreOrderRepository extends BaseRepository
                         $data['status'] = 2;
                     } else {
                         $data['status'] = $value['status'];
-                    }  
+                    }
                     Db::name('store_order')->where('order_sn', $value['order_sn'])->update($data);
                     $s = [
                         'order_id' => $value['order_id'],
@@ -7440,9 +7458,13 @@ class StoreOrderRepository extends BaseRepository
                 ->whereIn('status', [0, 1, 2, 3])
                 ->sum('pay_price');
 //            if ($pay_price >= 365) {
-            Db::name('user')->where('uid', $uid)->whereNotIn('user_group', [3, 4, 5, 6])->update([
-                'user_group' => 2
-            ]);
+//            Db::name('user')->where('uid', $uid)->whereNotIn('user_group', [3, 4, 5, 6])->update([
+//                'user_group' => 2
+//            ]);
+            // 设置用户 身份
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            $userRepository->setUserIdentity($uid);
         }
 
         $shouxufei = systemConfig('online_yanglao');
@@ -7471,9 +7493,12 @@ class StoreOrderRepository extends BaseRepository
         }
 
         if ($product_id == 15323) {
-            Db::name('user')->where('uid', $uid)->whereNotIn('user_group', [3, 4, 5, 6])->update([
-                'user_group' => 4//升級創客
-            ]);
+//            Db::name('user')->where('uid', $uid)->whereNotIn('user_group', [3, 4, 5, 6])->update([
+//                'user_group' => 4//升級創客
+//            ]);
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            $userRepository->setUserIdentity($uid);
         }
 
         Db::name('store_order')->where('order_id', $order_id)
@@ -9228,6 +9253,20 @@ class StoreOrderRepository extends BaseRepository
         return $group;
     }
 
+    public function con_log_pv($uid, $num, $order_id, $order_type, $mark, $status = -1)
+    {
+        // 添加pv记录
+        $pv_data = [
+            "uid" => $uid,
+            "pv" => $num,
+            "addtime" => time(),
+            "status" => $status,
+            "order_type" => $order_type,
+            "order_id" => $order_id,
+            "mark" => str_replace('贡献值', 'PV', $mark),
+        ];
+        Db::name("user_pv_log")->insert($pv_data);//添加pv记录
+    }
 
     //添加贡献值日志
     public function con_log($uid, $num, $order_id, $order_type, $mark, $status = -1, $pv = 0)
@@ -9559,6 +9598,7 @@ class StoreOrderRepository extends BaseRepository
                 $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
                 // 贡献值
                 $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送贡献值");
+                $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送贡献值");
                 // 积分
                 $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送积分");
 
@@ -9779,6 +9819,9 @@ class StoreOrderRepository extends BaseRepository
 
             $this->bill_user_log($user_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . bcmul($pv, 0.035, 2), $store_order_data['mer_id']);
             $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1, $gx_jf);
+            // $this->bill_user_log($user_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
+            $this->con_log_pv($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1);
+            // $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1);
             $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分", 1);
 
             //查询下单用户上级身份（2.0新表用户）
@@ -10052,12 +10095,18 @@ class StoreOrderRepository extends BaseRepository
             if ($totalPayPrice >= 1180 && $totalPayPrice < 11800) {
 
                 if ($userdata['user_group'] <= 1) {
-                    Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
+//                    Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
+                    /** @var UserRepository $userRepository */
+                    $userRepository = app()->make(UserRepository::class);
+                    $userRepository->setUserIdentity($store_order_data['uid']);
                 }
 
             } else if ($totalPayPrice >= 11800) {
                 if ($userdata['user_group'] <= 2) {
-                    Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
+//                    Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
+                    /** @var UserRepository $userRepository */
+                    $userRepository = app()->make(UserRepository::class);
+                    $userRepository->setUserIdentity($store_order_data['uid']);
                 }
             }
 

app/common/repositories/store/order/StoreRefundOrderRepository.php

@@ -1516,4 +1516,57 @@ class StoreRefundOrderRepository extends BaseRepository
         });
         return true;
     }
+
+    /**
+     * 取消订单福利
+     * @param $id
+     * @throws \think\db\exception\DbException
+     */
+    public function cancelOrderBonus($id)
+    {
+
+        // //分配逻辑
+        // $store_order_data = Db::name('store_order')->where('group_order_id',$group_order_id)->find();
+        //
+        // //找到对应的商品id(product_id)
+        // $store_order_product_data = Db::name('store_order_product')->where('order_id',$store_order_data['order_id'])->find();
+        // //找到对应的商品让利金额或比例
+        // $store_product_data = Db::name('store_product')->where('product_id',$store_order_product_data['product_id'])->find();
+        // //下单用户
+        // $user_data = Db::name('user')->where('uid',$store_order_data['uid'])->find();
+        // $concession_pri =  $store_order_data['con_pri'];
+
+
+        $refundOrder = $this -> dao -> getWhere(['refund_order_id' => $id]);
+        if(!$refundOrder){
+            return ['code'=>-6,'message'=>'找不到退款订单'];
+        }
+        $refundOrder = $refundOrder -> toArray();
+        $orderId = $refundOrder['order_id'];
+
+        Db::name("user_bill")
+            ->where('link_id', $orderId)
+            ->where('status', 0)
+            ->update(['status' => -1]);
+
+        Db::name("user_sign_fugou")
+            ->where('order_id', $orderId)
+            ->where('status', -1)
+            ->update(['status' => 0]);
+
+        Db::name("user_sign_score")
+            ->where('order_id', $orderId)
+            ->where('status', -1)
+            ->update(['status' => 0]);
+
+        Db::name("user_sign_gongxian")
+            ->where('order_id', $orderId)
+            ->where('status', -1)
+            ->update(['status' => 0]);
+
+        Db::name("user_pv_log")
+            ->where('order_id', $orderId)
+            ->where('status', -1)
+            ->update(['status' => 0]);
+    }
 }

app/common/repositories/store/product/ProductReplyRepository.php

@@ -256,8 +256,51 @@ class ProductReplyRepository extends BaseRepository
 
     /*用户评价列表*/
     public function  getReplyList($where=[],$page=1, $limit=10){
-        $count =  Db::name("store_product_reply")->where($where)->count();
-        $list = Db::name("store_product_reply")->page($page, $limit)->where($where)->select();
+        $count = Db::name("store_product_reply")
+            ->where($where)
+            ->count();
+        $list = Db::name("store_product_reply")
+            //            ->alias('spr')  // 给主表起个别名
+            //            ->join('store_order_product rsop', 'spr.order_product_id = rsop.order_product_id', 'LEFT')  // 左连接
+            //            ->field('spr.*, rsop.*')
+            ->where($where)
+            ->page($page, $limit)
+            ->select()
+            ->toArray();
+
+        $order_product_id_list = array_column($list,'order_product_id');
+        $order_product_info_list = Db::name("store_order_product")
+            ->whereIn('order_product_id',$order_product_id_list)
+            ->select()
+            ->toArray();
+        $order_product_info_map = array_column($order_product_info_list, null, 'order_product_id');
+
+        $mer_id_list = array_column($list,'mer_id');
+        $mer_info_list = Db::name("merchant")
+            ->whereIn('mer_id',$mer_id_list)
+            ->select()
+            ->toArray();
+        $mer_info_map = array_column($mer_info_list, null, 'mer_id');
+
+        foreach ($list as &$item) {
+            if (!empty($order_product_info_map[$item['order_product_id']])) {
+                if (!empty($order_product_info_map[$item['order_product_id']]['cart_info'])) {
+                    $cart_info = json_decode($order_product_info_map[$item['order_product_id']]['cart_info']);
+                    if (json_last_error() == JSON_ERROR_NONE) {
+                        $order_product_info_map[$item['order_product_id']]['cart_info'] = $cart_info;
+                    }
+                }
+                $item['order_product_info'] = $order_product_info_map[$item['order_product_id']];
+            } else {
+                $item['order_product_info'] = new \stdClass();
+            }
+
+            if (!empty($mer_info_map[$item['mer_id']])) {
+                $item['mer_info'] = $mer_info_map[$item['mer_id']];
+            } else {
+                $item['mer_info'] = new \stdClass();
+            }
+        }
         return compact('count', 'list');
     }
 }

app/common/repositories/user/UserIdentityRepository.php

@@ -0,0 +1,110 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-05-07
+ *
+ * 
+ */
+
+namespace app\common\repositories\user;
+
+
+use app\common\dao\user\UserIdentityDao;
+use app\common\repositories\BaseRepository;
+use FormBuilder\Exception\FormBuilderException;
+use FormBuilder\Factory\Elm;
+use FormBuilder\Form;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+use think\facade\Route;
+
+/**
+ * Class UserIdentityRepository
+ * @package app\common\repositories\user
+ * @author xaboy
+ * @day 2020-05-07
+ * @mixin UserIdentityDao
+ */
+class UserIdentityRepository extends BaseRepository
+{
+    /**
+     * @var UserIdentityDao
+     */
+    protected $dao;
+
+    /**
+     * UserGroupRepository constructor.
+     * @param UserIdentityDao $dao
+     */
+    public function __construct(UserIdentityDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param array $where
+     * @param $page
+     * @param $limit
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author xaboy
+     * @day 2020-05-07
+     */
+    public function getList(array $where, $page, $limit)
+    {
+        $query = $this->dao->search($where);
+        $count = $query->count($this->dao->getPk());
+        $list = $query->page($page, $limit)->select();
+        return compact('count', 'list');
+    }
+
+    /**
+     * @param null $id
+     * @param array $formData
+     * @return Form
+     * @throws FormBuilderException
+     * @author xaboy
+     * @day 2020-05-07
+     */
+    public function form($id = null, array $formData = [])
+    {
+        $action = Route::buildUrl('configIdentityUpdate' , compact('id'))->build();
+        return Elm::createForm($action, [
+            Elm::number('arrive_num_own', '个人达标贡献值')->min(0)->size('large'),
+            Elm::number('arrive_num_team', '团队达标贡献值')->min(0)->size('large')
+        ])->setTitle('业务员升级设置')->formData($formData);
+    }
+
+    /**
+     * @param $id
+     * @return Form
+     * @throws FormBuilderException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author xaboy
+     * @day 2020-05-07
+     */
+    public function updateForm($id)
+    {
+        return $this->form($id, $this->dao->get($id)->toArray());
+    }
+
+    /**
+     * @param array $where
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getIdentityList(array $where = [])
+    {
+        $query = $this->dao->search($where);
+        return $query->select()->toArray();
+    }
+}

app/common/repositories/user/UserRepository.php

@@ -3225,4 +3225,206 @@ class UserRepository extends BaseRepository
         $resultArray = array_diff($originalArray, [$uid]);
         return $resultArray;
     }
+
+
+    /**
+     * 设置用户 身份
+     * @param $uid
+     * @param $identityId
+     * @return int|mixed|null
+     * @throws DbException
+     */
+    public function setUserIdentity($uid, $identityId = null)
+    {
+        $result = null;
+        if (empty($identityId)) {
+            $identityId = $this->getUserIdentity($uid);
+        }
+        $this->dao->update($uid, ['user_group' => $identityId]);
+        return $identityId;
+    }
+
+    /**
+     * 获取用户 身份
+     * @param $uid
+     * @return int|mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getUserIdentity($uid)
+    {
+        // 1、获取所有等级信息
+        /** @var UserIdentityRepository $identityRepository */
+        $identityRepository = app()->make(UserIdentityRepository::class);
+        $identityList = $identityRepository->getIdentityList();
+
+        // 2、获取身份需要的最深等级
+        $lowerLevelNumList = array_column($identityList, 'lower_level_num');
+        $lowerLevelNumMax = max($lowerLevelNumList);
+        $lowerLevelNumMin = min($lowerLevelNumList);
+        $needLower = $lowerLevelNumMax;
+        if($lowerLevelNumMin == 0) {
+            $needLower = $lowerLevelNumMin;
+        }
+
+        // 3、获取下级用户 贡献值
+        $userContributionSumMap = [];
+        $uidContributeList = $this->getUidContributeListBySpreadUidList([$uid]);
+        foreach ($uidContributeList as $uidContribute) {
+            $userContributionSumMap[$uidContribute['uid']] = $this->getContributionSumByLevel([$uidContribute['uid']], $needLower);
+            $userContributionSumMap[$uidContribute['uid']][0] = $uidContribute['contribute'];
+        }
+
+        // 4、获取个人贡献值
+        $userData = $this->dao->get($uid)->toArray();
+
+        // 5、当前用户等级
+        $identityId = 0;
+        usort($identityList, function ($a, $b) {
+            return $b['user_group_id'] <=> $a['user_group_id'];  // 反转顺序，倒序排列
+        });
+        foreach ($identityList as $item) {
+            $lowerLevelNum = $item['lower_level_num']??0;
+
+            $arriveNumOwn = $userData['contribute'];
+            $arriveNumTeam = 0;
+            $subordinateContribution = [];
+
+            foreach ($userContributionSumMap as $key => $value) {
+                $subordinateContribution[$key] = 0;
+                if ($lowerLevelNum != 0) {
+                    foreach ($value as $k => $v) {
+                        if ($k <= $lowerLevelNum) {
+                            $subordinateContribution[$key] += $v;
+                        } else {
+                            break;
+                        }
+                    }
+                } else {
+                    $subordinateContribution[$key] = array_sum($value);
+                }
+            }
+            if (!empty($subordinateContribution)) {
+                // 大区业绩
+                $dqYj = max($subordinateContribution);
+                // 总业绩
+                $zYj = array_sum($subordinateContribution);
+                // 小区团体业绩
+                $arriveNumTeam = bcsub($zYj, $dqYj, 2);
+            }
+            if ($item['arrive_num_own'] <= $arriveNumOwn && $item['arrive_num_team'] <= $arriveNumTeam) {
+                $identityId = $item['user_group_id'];
+                break;
+            }
+        }
+        return $identityId;
+    }
+
+    /**
+     * 获取该会员的所有下级会员
+     */
+    public function getUidContributeListBySpreadUidList(array $uidList)
+    {
+        return Db::name("user")
+            ->whereIn("spread_uid", $uidList)
+            ->field("uid, contribute, spread_uid")
+            ->select()
+            ->toArray();
+    }
+
+    /**
+     * 计算指定用户下属每一层级的总贡献值。
+     *
+     * @param array $initialUserIds 初始用户ID列表 (视为第0层)。
+     * @param int $maxDepth 需要查询的最大深度（相对于初始列表）。
+     *                      0 表示查询所有层级直到末端。
+     *                      1 表示只计算第1层（直接下级）的总贡献。
+     *                      N 表示计算到第 N 层（包含第N层）的总贡献。
+     * @return array 返回一个数组，键是层级号（从1开始），值是该层级所有用户的贡献值总和。
+     *               例如：[ 1 => 600, 2 => 1300 ]
+     */
+    public function getContributionSumByLevel(array $initialUserIds, int $maxDepth = 0): array
+    {
+        $levelContributions = []; // 结果数组 [level => total_contribution]
+        if (empty($initialUserIds)) {
+            return $levelContributions;
+        }
+
+        $currentLevelIds = $initialUserIds; // 当前层级的用户ID (初始为第0层)
+        $currentLevel = 0; // 当前层级号
+
+        // 使用一个集合跟踪所有已处理过的下级用户ID，防止重复计算和循环
+        $processedSubordinateIds = [];
+
+        while (!empty($currentLevelIds)) {
+            // 计算下一层级的编号
+            $nextLevel = $currentLevel + 1;
+
+            // 检查是否达到最大深度限制
+            if ($maxDepth > 0 && $nextLevel > $maxDepth) {
+                break; // 停止查询更深的层级
+            }
+
+            // 批量查询当前层级用户的直接下级
+            // 使用 array_chunk 防止 WHERE IN 子句过长 (根据数据库限制调整 chunkSize)
+            $chunkSize = 500;
+            $subordinatesOfCurrentLevel = [];
+            foreach(array_chunk($currentLevelIds, $chunkSize) as $chunk) {
+                $subordinatesChunk = Db::name('user')
+                    ->field('uid, contribute') // 只需要下级的uid和贡献值
+                    ->whereIn('spread_uid', $chunk) // spread_uid 在当前层级用户块中
+                    ->select()
+                    ->toArray();
+                $subordinatesOfCurrentLevel = array_merge($subordinatesOfCurrentLevel, $subordinatesChunk);
+            }
+
+            // 如果没有找到任何下级，结束循环
+            if (empty($subordinatesOfCurrentLevel)) {
+                break;
+            }
+
+            $nextLevelTotalContribution = 0;
+            $nextLevelIds = []; // 存储下一轮需要查询的用户ID
+
+            // 遍历找到的所有下级
+            foreach ($subordinatesOfCurrentLevel as $subordinate) {
+                $subordinateId = $subordinate['uid'];
+                $subordinateContribution = $subordinate['contribute'] ?? 0; // 安全获取，默认为0
+
+                // 累加下一层级的总贡献值
+                // 注意：这里简单累加，如果一个下级同时被当前层多个用户推荐，其贡献会被计算多次
+                // 如果要求每个下级只贡献一次（即使有多个上级），需要调整逻辑，
+                // 例如在累加前检查 $processedSubordinateIds
+
+                // --- 修改点：确保每个下级贡献只被计算一次 ---
+                // if (!isset($processedSubordinateIds[$subordinateId])) { // 如果这个下级还没被处理过
+                $nextLevelTotalContribution += (float)$subordinateContribution;
+                // }
+                // 注释掉上面的检查，因为用户描述似乎是按层级直接累加，不管这个下级是否被上层处理过。
+                // 如果A1和A2都属于第1层，他们各自的下级B1和B2都属于第2层，B1和B2的贡献值直接加到第2层的总和里。
+                // 如果需要严格按“人”计算，即使一个人出现在多层或被多人推荐也只算一次，则需要解开注释并调整
+
+                // 收集下一轮需要查询的用户ID，同样需要防止重复处理
+                if (!isset($processedSubordinateIds[$subordinateId])) {
+                    $nextLevelIds[] = $subordinateId;
+                    // 标记这个下级ID已处理过，避免在更深层级中再次将其加入查询队列
+                    $processedSubordinateIds[$subordinateId] = true;
+                }
+
+            }
+
+            // 存储下一层级的总贡献值 (只有当贡献值大于0或你想记录空层级时)
+            // 根据例子，我们只记录有贡献的层级，或者至少有用户的层级
+            if (!empty($subordinatesOfCurrentLevel)) { // 只要找到了下级就记录该层
+                $levelContributions[$nextLevel] = $nextLevelTotalContribution;
+            }
+
+            // 准备下一轮迭代
+            $currentLevelIds = array_unique($nextLevelIds); // 去重下一层的用户ID
+            $currentLevel = $nextLevel; // 更新当前层级
+        }
+
+        return $levelContributions;
+    }
 }

app/common/repositories/user/UserThirdRepository.php

@@ -865,6 +865,18 @@ class UserThirdRepository extends BaseRepository
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加贡献记录
             log::info("===添加完积分和贡献值");
 
+            // 添加pv记录
+            $pv_data = [
+                "uid"           =>$user_id,
+                "pv"            =>$gongxian,
+                "addtime"       =>time(),
+                "status"        =>-1,
+                "order_type"    =>$type_shop,
+                "order_id"      =>$order_sn,
+                "mark"          =>"购买{$make}商品获得的PV",
+            ];
+            Db::name("user_pv_log")->insert($pv_data);//添加pv记录
+
             //判断是否是老用户  is_old=1是1.0的用户，1.0的用户要总pv*45%的红包
             if($user["is_old"]==1){
                 //添加红包

app/controller/admin/system/config/Identity.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-03-24
+ *
+ * 
+ */
+
+namespace app\controller\admin\system\config;
+
+
+use crmeb\basic\BaseController;
+use app\common\repositories\user\UserIdentityRepository;
+use FormBuilder\Exception\FormBuilderException;
+use think\App;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+
+/**
+ * Class Config
+ * @package app\controller\admin\system\config
+ * @author xaboy
+ * @day 2020-03-27
+ */
+class Identity extends BaseController
+{
+    /**
+     * @var UserIdentityRepository
+     */
+    protected $repository;
+
+    /**
+     * Config constructor.
+     * @param App $app
+     * @param UserIdentityRepository $repository
+     */
+    public function __construct(App $app, UserIdentityRepository $repository)
+    {
+        parent::__construct($app);
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author xaboy
+     * @day 2020-03-31
+     */
+    public function lst()
+    {
+        $where = $this->request->params(['keyword']);
+        [$page, $limit] = $this->getPage();
+        $lst = $this->repository->getList($where, $page, $limit);
+
+        return app('json')->success($lst);
+    }
+
+    /**
+     * @param int $id
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @throws FormBuilderException
+     * @author xaboy
+     * @day 2020-03-31
+     */
+    public function updateTable($id)
+    {
+        if (!$this->repository->exists($id)) app('json')->fail('数据不存在');
+        $form = $this->repository->updateForm($id);
+        return app('json')->success(formToData($form));
+    }
+
+    /**
+     * @param int $id
+     * @return mixed
+     * @throws DbException
+     * @author xaboy
+     * @day 2020-03-27
+     */
+    public function update($id)
+    {
+        $data = $this->request->params(['arrive_num_own', 'arrive_num_team']);
+        $this->repository->update($id, $data);
+        return app('json')->success('修改成功');
+    }
+
+}

app/controller/api/Auth.php

@@ -1899,11 +1899,12 @@ class Auth extends BaseController
             if(empty($sessionKey['sessionKey'])||empty($encryptedData['encryptedData'])||empty($iv['iv'])){
                 return app('json')->fail('参数不正确');
             }
-            $appid = 'wx82986c4471ce7efc';
-            if($this->source=='yhc'){
-                $appid = 'wx82986c4471ce7efc';
-            }
-            $appid = 'wx7b4d857deb0447f3';
+//            $appid = 'wx82986c4471ce7efc';
+//            if($this->source=='yhc'){
+//                $appid = 'wx82986c4471ce7efc';
+//            }
+//            $appid = 'wx7b4d857deb0447f3';
+            $appid = 'wx9082e5ac2fdb513f';
             $sessionKey =str_replace(' ','+', $sessionKey['sessionKey']);
 
             $encryptedData=str_replace(' ','+',$encryptedData['encryptedData']);

app/controller/api/Notify.php

@@ -4,6 +4,7 @@ namespace app\controller\api;
 use AdaPaySdk\AdapayTools;
 use app\common\repositories\movie\MovieRepository;
 use app\common\repositories\store\order\StoreRefundOrderRepository;
+use app\common\repositories\user\UserRepository;
 use app\controller\api\merchant\sxy\Access;
 use app\controller\api\store\service\Huafei;
 use think\facade\Db;
@@ -169,7 +170,7 @@ class Notify
                                     //if($job_par['note'] == "现金"){
                                     //普通消费者
                                     $ylj_pri = bcmul($concession_pri, 0.3,2);
-                                    $pv = bcmul($concession_pri, 0.35,2);  
+                                    $pv = bcmul($concession_pri, 0.35,2);
 
                                     //分配养老金给消费者
                                     $ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
@@ -180,6 +181,7 @@ class Notify
                                     //Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,"contribute"=>$con,"score"=>$score]);
 
                                     $this->bill_user_log($user_data['uid'],$ylj_pri,$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.$ylj_pri,$store_order_data['mer_id'],0);
+                                    $this->con_log_pv($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送贡献值");
                                     $this->con_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送贡献值");
                                     $this->score_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送积分");
 
@@ -301,8 +303,10 @@ class Notify
                                         if($spread_data['user_group'] == 1){
                                             //给推广者分配佣金
                                             // $ylj_amount = $spread_data['annuity'] + round($pv * 0.3,2);
-                                            $yj_amount_90 = bcmul($pv, 0.21,2) * 0.9;
-                                            $fgj_amount_10 = bcmul($pv, 0.21,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                            // $yj_amount_90 = round($pv * 0.21,2) * 0.9;
+                                            $yj_amount_90 = bcmul($pv, 0.3,2) * 0.9;
+                                            // $fgj_amount_10 = round($pv * 0.21,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                            $fgj_amount_10 = bcmul($pv, 0.3,2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -310,8 +314,8 @@ class Notify
 
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
 
-                                            $con = $spread_data['contribute'] + bcmul($pv, 0.21,2);
-                                            $score = $spread_data['score'] + bcmul($pv, 0.21,2);
+                                            $con = $spread_data['contribute'] + bcmul($pv, 0.3,2);
+                                            $score = $spread_data['score'] + bcmul($pv, 0.3,2);
 
                                             //贡献值和积分
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(["contribute"=>$con,"score"=>$score]);
@@ -320,8 +324,8 @@ class Notify
 
                                             //推广佣金
                                             $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id'],0);
-                                            $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送贡献值");
-                                            $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送积分");
+                                            $this->con_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送贡献值");
+                                            $this->score_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送积分");
 
 
 
@@ -413,6 +417,8 @@ class Notify
  
                                 $this->bill_user_log($user_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
  
+                                $this->con_log_pv($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
+                                // $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
                                 $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1, $gx_jf);
                                 $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
 
@@ -550,7 +556,7 @@ class Notify
                                         // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.round($pv * 0.01,2),$store_order_data['mer_id']);
 
                                         //获取贡献值和积分和佣金
-                                        $gx_jf = $spread_data['contribute'] + bcmul($pv, 0.21,2);
+                                        $gx_jf = $spread_data['contribute'] + bcmul($pv, 0.3,2);
 
                                         //$yj111 = $spread_data['brokerage_price'] + $yj1;
 
@@ -563,8 +569,8 @@ class Notify
 
 
                                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
-                                        $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, round($pv * 0.21,2));
-                                        $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
+                                        $this->con_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, round($pv * 0.21,2));
+                                        $this->score_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
                                         //推广佣金
                                         $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id']);
                                     }
@@ -1398,8 +1404,20 @@ class Notify
         return $newList;
     }
 
-
-
+    public function con_log_pv($uid, $num, $order_id, $order_type, $mark, $status = -1)
+    {
+        // 添加pv记录
+        $pv_data = [
+            "uid" => $uid,
+            "pv" => $num,
+            "addtime" => time(),
+            "status" => $status,
+            "order_type" => $order_type,
+            "order_id" => $order_id,
+            "mark" => str_replace('贡献值', 'PV', $mark),
+        ];
+        Db::name("user_pv_log")->insert($pv_data);//添加pv记录
+    }
 
     //添加贡献值日志
     public function con_log($uid,$num,$order_id,$order_type,$mark,$status = -1, $pv = 0){
@@ -1416,6 +1434,9 @@ class Notify
 
                 if (strpos($mark, "购买") !== false) {
                     Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+                    /** @var UserRepository $userRepository */
+                    $userRepository = app()->make(UserRepository::class);
+                    $userRepository->setUserIdentity($uid);
                 }
 
                 if (strpos($mark, "推广") !== false) {
@@ -1425,7 +1446,7 @@ class Notify
                 if($pv > 0){
                     Db::name('user')->where("uid", $uid)->update(['pv' => $con_data['pv'] + $pv]);
                 }
-             
+
                 //if(count($spread_data) > 0){
                     // $all_ids = [];
                     // foreach($spread_data as $k=>$v){
@@ -1473,10 +1494,13 @@ class Notify
             //     //     echo "字符串1包含'推广'\n";
             //     // }
 
-            //     // 检查是否包含“购买”
-            //     if (strpos($mark, "购买") !== false) {
-            //         Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
-            //     }
+                // 检查是否包含“购买”
+                if (strpos($mark, "购买") !== false) {
+                    Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+                    /** @var UserRepository $userRepository */
+                    $userRepository = app()->make(UserRepository::class);
+                    $userRepository->setUserIdentity($uid);
+                }
 
                  
                

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

@@ -0,0 +1,707 @@
+<?php
+
+
+namespace app\controller\api\store\merchant;
+
+
+use think\facade\Db;
+
+class TaskPartnerProfits
+{
+    public function getTime($timePeriod)
+    {
+        // 定义时间区间
+        $now = time();
+        $startTime = '';
+        $endTime = '';
+        if ($timePeriod == 'last_week') {
+            // 上周的时间区间
+            $startTime = date('Y-m-d', strtotime('monday last week', $now)); // 上周星期一的开始时间
+            $endTime = date('Y-m-d', strtotime('sunday last week', $now)); // 上周星期日的结束时间
+        } elseif ($timePeriod == 'this_week') {
+            // 这周的时间区间
+            $startTime = date('Y-m-d', strtotime('monday this week', $now)); // 这周星期一的开始时间
+            $endTime = date('Y-m-d', strtotime('sunday this week', $now)); // 这周星期日的结束时间
+        }
+//        return ['startTime' => '2025-03-10', 'endTime' => '2025-03-23'];
+        return ['startTime' => $startTime, 'endTime' => $endTime];
+    }
+
+    public function getTeamPvByTime($timePeriod = 'last_week', $removeUserIdList = [])
+    {
+        $timeMap = $this->getTime($timePeriod);
+        $startTime = $timeMap['startTime'];
+        $endTime = $timeMap['endTime'];
+
+        // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
+        $orders = Db::name("store_order")
+            ->where('mer_id', 496)
+            ->whereNotIn('uid', $removeUserIdList)
+            ->whereIn('status', [0, 1, 2, 3])
+            ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
+            ->whereBetween("pay_time", [$startTime . ' 00:00:00', $endTime . ' 23:59:59'])
+            ->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;
+    }
+
+    public function getRedEnvelopeByTime($timePeriod = 'last_week', $removeUserIdList = [])
+    {
+        $timeMap = $this->getTime($timePeriod);
+        $startTime = $timeMap['startTime'];
+        $endTime = $timeMap['endTime'];
+
+        // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
+        $redEnvelopeList = Db::name("user_sign_hongbao")
+            ->whereNotIn('uid', $removeUserIdList)
+            ->where('status', 1)
+            ->whereBetween("settlement_time", [$startTime . ' 00:00:00', $endTime . ' 23:59:59'])
+            ->select()
+            ->toArray();
+        return floor(array_sum(array_column($redEnvelopeList, 'number')) * 100) / 100;
+    }
+
+    public function partnerProfits()
+    {
+        // 查询测试人员账号信息
+        //18973958920
+        //15186694339
+        //18833633835
+        //19525470098
+        //17756507016
+        //18226705337
+        $testAccount = ['18973958920', '15186694339', '18833633835', '19525470098', '17756507016', '18226705337'];
+        $removeUserList = Db::name("user")
+            ->whereIn('account', $testAccount)
+            ->where("status", "<>", 0)
+            ->where('is_del', '<>', 1)
+            ->select()
+            ->toArray();
+        $removeUserIdList = array_column($removeUserList, 'uid');
+        // 定义分红金额
+        $weekRecord = $this->getTeamPvByTime('last_week', $removeUserIdList);
+        // 分红金额 - 红包金额
+        $redEnvelope = $this->getRedEnvelopeByTime('last_week', $removeUserIdList);
+
+        $weekRecord -= $redEnvelope;
+        if ($weekRecord <= 0) {
+            return json('无效分红金额');
+        }
+
+
+        // 1、获取用户星级信息
+        //$star_list = Db::name("user_star")->order("statement_all_num desc")->select()->toArray();//旧星级等级
+        $starList = Db::name("old_user_starlevel")
+            ->whereIn('title', ['初级', '中级', '高级'])
+            ->order("statement_all_num desc")
+            ->select()
+            ->toArray();//星级等级
+
+        // 2、循环星级信息 并分组归类
+        $salesArr = array_column($starList, null, 'title');
+
+        // 3、获取 分红用户 信息 （`user_group` tinyint(1) DEFAULT '1' COMMENT '1消费者 2,推广业务员 3，业务经理 4初级合伙人5中级合伙人 6高级合伙人 7.懂事',）
+        $list = Db::name("user")
+//            ->whereNotIn('uid', $removeUserIdList)
+            ->where("user_group", "IN", [4, 5, 6])
+            ->where("status", "<>", 0)
+            ->where('is_del', '<>', 1)
+            ->select()
+            ->toArray();
+
+        // 4、将用户装载到 星级等级 分红数据中
+        foreach ($list as $key => $value) {
+            if ($value['user_group'] == 4) {
+                $salesArr['初级']['divider_people'][] = $value['uid'];
+            } else if ($value['user_group'] == 5) {
+                $salesArr['中级']['divider_people'][] = $value['uid'];
+            } else if ($value['user_group'] == 6) {
+                $salesArr['高级']['divider_people'][] = $value['uid'];
+            }
+        }
+
+        // 5、移除特定人员
+        // 要移动的ID数组
+//        $ids_to_remove_from_junior = array(12, 69, 144); // 从初级中移除的ID
+//        $ids_to_remove_from_intermediate = array(49); // 从中级中移除的ID
+//        // 查找初级并获取其divider_people
+//        $junior = &$salesArr['初级']['divider_people']; // 使用引用，以便直接修改数组
+//        // 查找中级并获取其divider_people
+//        $intermediate = &$salesArr['中级']['divider_people']; // 使用引用，以便直接修改数组
+//        // 从初级的divider_people中移除特定的ID
+//        foreach ($ids_to_remove_from_junior as $id) {
+//            $key = array_search($id, $junior);
+//            if ($key !== false) {
+//                unset($junior[$key]); // 移除初级中的特定ID
+//            }
+//        }
+//        // 从中级的divider_people中移除特定的ID
+//        foreach ($ids_to_remove_from_intermediate as $id) {
+//            $key = array_search($id, $intermediate);
+//            if ($key !== false) {
+//                unset($intermediate[$key]); // 移除中级中的特定ID
+//            }
+//        }
+//        // 重置数组的索引，因为unset会留下空位
+//        $salesArr['初级']['divider_people'] = array_values($junior);
+//        $salesArr['中级']['divider_people'] = array_values($intermediate);
+
+
+        // 6、执行分开发放
+        $partnerProfitsPvListByUid = [];
+        foreach ($salesArr as $key => $value) {
+            // 6.1 计算可分红金额
+            //比如这个周的总业绩是 8400
+            //周总业绩(8400) * 合伙人级别的分佣比例(15%) = 可分红的佣金(1260)
+//            $salesArr[$key]['fs_money_nums'] = round($weekRecord * $value['profit_rate'], 2);
+            $salesArr[$key]['fs_money_nums'] = floor(($weekRecord * ($value['profit_rate'] / 100)) * 100) / 100;
+            //可分红的业绩(分为两半，各50%，一部分是分给双联盟比例，一部分是小业绩比例)
+            //把本周的业绩(8400) * 合伙人级别的分佣比例(15%) * 0.5 = 630（可分红佣金的 50%）
+//            $salesArr[$key]['fs_money'] = round($salesArr[$key]['fs_money_nums'] / 2, 2);
+            $salesArr[$key]['fs_money'] = floor(($salesArr[$key]['fs_money_nums'] / 2) * 100) / 100;
+
+            // 6.2 计算所有人的 PV值
+            $salesArr[$key]['maxValueAll'] = 0;
+            $salesArr[$key]['sumOfOthersAll'] = 0;
+            $salesArr[$key]['dividerPeoplePv'] = [];
+            foreach ($value['divider_people'] as $k => $v) {
+                // 6.2.1 查出分红人的所有部门 即 下级用户
+                $spreadUserUidList = $this->getSpreadUserUidListByUidList([$v]);
+                if (empty($spreadUserUidList[$v])) {
+                    continue;
+                }
+
+                // 6.2.2 获取当前分红人的所有部门 内的下级成员，递归获取至最低一级
+                $subordinatesBatch = $this->getSubordinatesBatch($spreadUserUidList[$v]);
+                // 6.2.3 获取所有部门（下线）的PV值
+                foreach ($subordinatesBatch as $k1 => $v1) {
+                    // 获取当前下线的PV值, 忽略测试人员的账号
+                    $pv = $this->getPv(array_merge($v1, [$k1]), $removeUserIdList);
+                    if (!empty($pv)) {
+                        $partnerProfitsPvListByUid[$v][$k1] = $pv;
+                    }
+                }
+
+                // 6.2.4 将PV值进行记录 以便后续计算
+                if (!empty($partnerProfitsPvListByUid[$v])) {
+                    // 获取数组中的最大值
+                    $maxValue = max($partnerProfitsPvListByUid[$v]);
+                    // 计算总和
+                    $totalSum = array_sum($partnerProfitsPvListByUid[$v]);
+                    // 计算除最大值外其余值的和
+                    $sumOfOthers = $totalSum - $maxValue;
+
+                    $salesArr[$key]['dividerPeoplePv'][$v]['maxValue'] = $maxValue;
+                    $salesArr[$key]['dividerPeoplePv'][$v]['sumOfOthers'] = $sumOfOthers;
+                    $salesArr[$key]['maxValueAll'] += $maxValue;
+                    $salesArr[$key]['sumOfOthersAll'] += $sumOfOthers;
+                }
+            }
+        }
+
+        // 7、执行分红
+        $testRecord = [];
+        foreach ($salesArr as $key => $value) {
+            $amount = $value['fs_money'];//可分红的总佣金，分红佣金的一半,中级合伙61.95
+            $fsMoneyNums = $value['fs_money_nums'];//中级合伙人级别，可分红的总佣金
+            $maxValueAll = $value['maxValueAll'];//当前级别合伙人下面所有的双联盟业绩
+            $sumOfOthersAll = $value['sumOfOthersAll'];//当前级别合伙人下面所有的小区(业绩小的部分)总业绩
+
+            if (count($value['divider_people']) <= 0) {
+                continue;
+            }
+            //每人分红金额
+            foreach ($value['divider_people'] as $v) {
+
+                //个人小区(佣金少的一部分) 权重 计算权重
+                //返回是数组，下标0是最小的值(业绩小的)，下标1是最大的值(业绩大的)
+                $userPvSmallNum = $value['dividerPeoplePv'][$v]['sumOfOthers'] ?? 0;
+//                $myMixMoney = round($amount * ($userPvSmallNum / $sumOfOthersAll), 2);
+                $myMixMoney = floor(($amount * (floor(($userPvSmallNum / $sumOfOthersAll) * 100) / 100)) * 100) / 100;
+
+                //个人双区总佣金 权重 计算
+                $myBill = $value['dividerPeoplePv'][$v]['maxValue'] ?? 0;
+                //中级合伙人。userid=17可以分到双区可分红的金额
+                //可分红的佣金 * (中级合伙人个人的双区总业绩 / 当前等级所有合伙人的双联盟业绩) = 当前用户可以获取到的分红佣金(双区联盟总业绩加权佣金),287742 * (61.95/431032)=41.36
+//                $myWeightMoney = round($amount * ($myBill / $maxValueAll), 2);
+                $myWeightMoney = floor(($amount * (floor((($myBill + $userPvSmallNum) / ($maxValueAll + $sumOfOthersAll)) * 100) / 100)) * 100) / 100;
+
+
+                $salesArr[$key]['dividerPeoplePv'][$v]['myWeightMoney'] = $myWeightMoney;
+                $salesArr[$key]['dividerPeoplePv'][$v]['myMixMoney'] = $myMixMoney;
+                $salesArr[$key]['dividerPeoplePv'][$v]['maxValueAll'] = $maxValueAll;
+                $salesArr[$key]['dividerPeoplePv'][$v]['sumOfOthersAll'] = $sumOfOthersAll;
+                $salesArr[$key]['dividerPeoplePv'][$v]['weekRecord'] = $weekRecord;
+
+                # code...
+                $allAward = $myWeightMoney + $myMixMoney;
+
+                //90%给佣金，10给复购金
+                $yj_90 = $allAward * 0.9;
+                $fg_10 = $allAward * 0.1;
+
+
+                $userdatassss = db::name("old_user_jbp")->where("id", $v)->find();
+                $datas_log = [
+                    'note' => "名称:" . $userdatassss['nick_name'] . " 用户:" . $v . " 双联盟总业绩:" . $maxValueAll . " 我的双区业绩:" . $myBill . " 小区总业绩:" . $sumOfOthersAll . " 我的业绩小的:" . $userPvSmallNum[0] . "  可分红佣金:" . $amount . "  可分红总佣金:" . $fsMoneyNums . "  小区业绩可分红:" . $myMixMoney . " 大区业绩可分红:" . $myWeightMoney . " 实际分得:" . $yj_90,
+                    'create_time' => date('Y-m-d H:i:s')
+                ];
+                $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
+
+                # code...
+                $res = Db::name("user")->where("uid", $v)->inc("total_amount_old", $yj_90)->save();
+
+                Db::name("user")->where("uid", $v)->inc("amount_old", $yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
+                Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
+
+                Db::name("user")->where("uid", $v)->inc("fugou", $fg_10)->save();
+
+
+                //if($res) {
+                $this->change_user_log($v, 'amount_old', 1, $yj_90, "member_award", "星级分红入账" . "-" . $value['title']);//释放佣金
+                //入账星级分红记录表
+                $week_data = [];
+                $week_data['user_id'] = $v;
+                $week_data['user_star_id'] = $key;
+                $week_data['award_num'] = $myWeightMoney;
+                $week_data['award_num_sm'] = $myMixMoney;
+                $week_data['remark'] = "星级分红主动执行:" . $yj_90;
+                $week_data['week_record'] = $weekRecord;
+                $week_data['all_amount'] = $fsMoneyNums;
+                $week_data['radio'] = 2;
+                $week_data['owner_bill'] = $maxValueAll;  //总流水金额
+                $week_data['my_bill'] = $myBill;  //我的流水
+                $week_data['create_time'] = time();
+
+                Db::name("old_user_weekaward")->insert($week_data);
+
+                $this->bill_user_log111111($v, "合伙人分佣", $yj_90, "合伙人分佣明细入账", 11);//联创分佣明细2.0系统
+                $this->fugou_user_log($v, $fg_10, 16, 1, 1);//复购金明细入账
+            }
+
+        }
+        return json($salesArr);
+    }
+
+    /**
+     * 获取该会员的所有下级会员
+     */
+    public function getSpreadUserUidListByUidList(array $uidList)
+    {
+        $son_ids = Db::name("user")
+            ->whereIn("spread_uid", $uidList)
+            ->field("uid,spread_uid")
+            ->select()
+            ->toArray();
+        $new_array_ids = [];
+        foreach ($son_ids as $key => $value) {
+            $new_array_ids[$value['spread_uid']][] = $value['uid'];
+        }
+        return $new_array_ids;
+    }
+
+    /**
+     * 递归查询下级用户并分组
+     *
+     * @param array $uids 初始用户ID数组
+     * @return array 分组后的下级用户ID数组
+     */
+    public function getSubordinates(array $uids): array
+    {
+        $result = [];
+
+        foreach ($uids as $uid) {
+            $result[$uid] = $this->getSubordinatesRecursively($uid);
+        }
+
+        return $result;
+    }
+
+    /**
+     * 获取该会员的所有下级会员
+     */
+    public function getSpreadUserUidAccountListByUidList($uid, $account = '')
+    {
+        $son_ids = Db::name("user")
+            ->where("spread_uid", $uid)
+            ->field("uid,spread_uid,account")
+            ->select()
+            ->toArray();
+        $new_array_ids = [];
+        foreach ($son_ids as $key => $value) {
+            $childList = $this->getSpreadUserUidAccountListByUidList($value['uid'], $value['account']);
+            $new_array_ids[] = [
+                '当前用户ID' => $value['uid'],
+                '当前用户的上级用户ID' => $value['spread_uid'],
+                '用户账号（手机号）' => $value['account'],
+                '当前用户的下级用户列表' => $childList
+            ];
+        }
+        return $new_array_ids;
+    }
+
+    /**
+     * 递归查询单个用户的下级用户
+     *
+     * @param int $uid 用户ID
+     * @param array $subordinates 用于存储下级用户ID的数组(内部使用, 递归传递)
+     * @return array 下级用户ID数组
+     */
+    private function getSubordinatesRecursively(int $uid, array &$subordinates = []): array
+    {
+        $subUidList = Db::name("user")
+            ->where("spread_uid", $uid)  // 直接使用 $uid, 不需要 whereIn
+            ->field("uid") //只需要查询uid
+            ->select()
+            ->toArray();
+
+        if (!empty($subUidList)) {
+            foreach ($subUidList as $subUser) {
+                $subUid = $subUser['uid'];
+                $subordinates[] = $subUid; // 添加到下级用户数组
+                $this->getSubordinatesRecursively($subUid, $subordinates); // 递归查询下级的下级
+            }
+        }
+        return $subordinates;
+    }
+
+    /**
+     * 递归获取所有下级ID（不分组）
+     * @param int $uid
+     * @param array $allSubordinates
+     * @return array
+     */
+    public function getAllSubordinates(int $uid, array &$allSubordinates = []): array
+    {
+        $subUidList = Db::name("user")
+            ->where("spread_uid", $uid)
+            ->column("uid");  // 使用 column 方法直接获取 uid 数组
+
+        if (!empty($subUidList)) {
+            foreach ($subUidList as $subUid) {
+                $allSubordinates[] = $subUid;
+                $this->getAllSubordinates($subUid, $allSubordinates);
+            }
+        }
+
+        return $allSubordinates;
+    }
+
+    /**
+     *  更高效的获取所有下级 (使用循环代替递归, 避免栈溢出)
+     * @param array $uids
+     * @return array
+     */
+    public function getAllSubordinatesIterative(array $uids): array
+    {
+        $result = [];
+
+        foreach ($uids as $uid) {
+            $result[$uid] = [];
+            $queue = [$uid];  // 使用队列来存储待处理的 UID
+            $processed = []; // 记录已经处理过的
+
+            while (!empty($queue)) {
+                $currentUid = array_shift($queue); // 从队列头部取出 UID
+                if (in_array($currentUid, $processed)) {
+                    continue; // 已经处理过
+                }
+                $processed[] = $currentUid;
+                $subUidList = Db::name("user")
+                    ->where("spread_uid", $currentUid)
+                    ->column("uid");
+
+                if (!empty($subUidList)) {
+                    $result[$uid] = array_merge($result[$uid], $subUidList); //合并
+                    $queue = array_merge($queue, $subUidList);  // 将新找到的下级 UID 加入队列尾部
+                }
+            }
+            $result[$uid] = array_unique($result[$uid]);//去重
+        }
+        return $result;
+    }
+
+    /**
+     * 获取多个用户的所有下级,  返回分组后的数组.  (更高效, 使用循环, 减少数据库查询次数)
+     * @param array $uids
+     * @return array 形如 ['A1' => [A11, A12, ...], 'A2' => [...]]
+     */
+    public function getSubordinatesBatch(array $uids): array
+    {
+        $result = [];
+        $allSubordinates = [];
+        $queue = $uids;
+        $processed = [];
+        //1. 找出所有的下级ID (不去重)
+        while (!empty($queue)) {
+            $currentUids = array_splice($queue, 0, 500); // 一次最多处理500个,防止in太多.  可以根据实际情况调整.
+            $currentUids = array_diff($currentUids, $processed); //去除已经查询过的
+            if (empty($currentUids)) continue;  //没有新的需要处理的
+            $processed = array_merge($processed, $currentUids);//记录
+            $subUidList = Db::name("user")
+                ->whereIn("spread_uid", $currentUids)
+                ->field("uid,spread_uid") // 需要查询 spread_uid 用于后续分组
+                ->select()
+                ->toArray();
+
+            if (!empty($subUidList)) {
+                $allSubordinates = array_merge($allSubordinates, $subUidList); //所有下级
+                $nextLevelUids = array_column($subUidList, 'uid');
+                $queue = array_merge($queue, $nextLevelUids);  //放到队列中
+            }
+        }
+        //2. 分组
+        foreach ($uids as $uid) {
+            $result[$uid] = []; // 初始化每个用户的下级数组
+        }
+        $allSubordinatesMap = [];
+        foreach ($allSubordinates as $item) {
+            $allSubordinatesMap[$item['spread_uid']][] = $item['uid'];
+        }
+
+        //3. 递归的将查到的下级进行分组
+        $group = function ($spreadUid) use (&$group, &$allSubordinatesMap, &$result) {
+            if (isset($allSubordinatesMap[$spreadUid])) {
+                foreach ($allSubordinatesMap[$spreadUid] as $subUid) {
+                    if (isset($result[$spreadUid])) {
+                        $result[$spreadUid][] = $subUid; //直接添加到结果中
+                    } else { //不属于直接上级, 查找上级的上级
+                        foreach ($result as $rootUid => &$subordinates) {
+                            if (in_array($spreadUid, $subordinates) || $rootUid == $spreadUid) {
+                                $subordinates[] = $subUid;
+                                break;
+                            }
+                        }
+                    }
+                    $group($subUid); //递归下一层
+                }
+            }
+        };
+        foreach ($uids as $uid) {
+            $group($uid);
+        }
+
+        // 4. 去重 (如果需要)
+        foreach ($result as $key => $value) {
+            $result[$key] = array_values(array_unique($value));
+        }
+        return $result;
+    }
+
+    // 获取用户PV值
+    public function getPv($userIdList, $removeUserIdList = [])
+    {
+        if (!empty($removeUserIdList)) {
+            $userIdList = array_values(array_diff($userIdList, $removeUserIdList));
+        }
+        // 基础查询构建器
+        $user_team_amount = Db::name("old_user_of_goods")
+            ->whereIn("user_id", $userIdList)
+            ->where('status', 1)
+            ->where('money', 1180)
+            ->select();
+        //$money1180Records = $this->old_user_of_goods->where('status', 1)->where('money', 1180)->select();
+        // 计算 status 为 1 且 money 为 1180 的记录总和（减去相应值后）
+        $money1180Sum = 0;
+        foreach ($user_team_amount as $record) {
+            $money1180Sum += $record['money'] - 300 - 180;
+        }
+
+        // 获取 status 为 1 且 money 为 11800 的记录集合
+        $money11800Records = Db::name("old_user_of_goods")
+            ->whereIn("user_id", $userIdList)
+            ->where('status', 1)
+            ->where('money', 11800)
+            ->select();
+        // 计算 status 为 1 且 money 为 11800 的记录总和（减去相应值后）
+        $money11800Sum = 0;
+        foreach ($money11800Records as $record) {
+            $money11800Sum += $record['money'] - 3000 - 1800;
+        }
+
+        $money10620Records = Db::name("old_user_of_goods")
+            ->whereIn("user_id", $userIdList)
+            ->where('status', 1)
+            ->where('money', 10620)
+            ->select();
+        // 计算 status 为 1 且 money 为 10620 的记录总和（减去相应值后）
+        $money10620Sum = 0;
+        foreach ($money10620Records as $record) {
+            $money10620Sum += $record['money'] - 2700 - 1620;
+        }
+
+
+        $money9440Records = Db::name("old_user_of_goods")
+            ->whereIn("user_id", $userIdList)
+            ->where('status', 1)
+            ->where('money', 9440)
+            ->select();
+        // 计算 status 为 1 且 money 为 9440 的记录总和（减去相应值后）
+        $money9440Sum = 0;
+        foreach ($money9440Records as $record) {
+            $money9440Sum += $record['money'] - 2400 - 1440;
+        }
+
+        $money2360Records = Db::name("old_user_of_goods")
+            ->whereIn("user_id", $userIdList)
+            ->where('status', 1)
+            ->where('money', 2360)
+            ->select();
+        // 计算 status 为 1 且 money 为 2360 的记录总和（减去相应值后）
+        $money2360Sum = 0;
+        foreach ($money2360Records as $record) {
+            $money2360Sum += $record['money'] - 600 - 360;
+        }
+
+        // 计算除去特定值后的总和
+        $otherMoneyRecords = [];
+//        $otherMoneyRecords = Db::name("old_user_of_goods")
+//            ->whereIn("user_id", $userIdList)
+//            ->whereNotIn('money', [1180, 11800, 10620, 9440, 2360])
+//            ->select();
+        $otherMoneySum = 0;
+        foreach ($otherMoneyRecords as $record) {
+            $otherMoneySum += $record['money'];
+        }
+        return $money1180Sum + $money11800Sum + $money10620Sum + $money9440Sum + $money2360Sum + (floor($otherMoneySum * 70) / 100);
+    }
+
+    //发放佣金 示例: $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)
+    {
+        $transition = [
+            'pv' => 1,
+            "gb" => 2,
+            "df" => 3,
+            "vr" => 4,
+            "bt" => 5,
+            "withdraw_quota_old" => 6,//提现
+            "unsettled_pension" => 7,
+            "amount_old" => 8//发放佣金
+        ];
+        $routineInfo = Db::name("old_routine_log_of_key")->where("key", $routine)->find();
+        if (empty($routineInfo)) {
+            return false;
+        }
+        $key_id = isset($routineInfo['id']) ? $routineInfo['id'] : 0;
+
+        if ($appoint_money > 0) {
+            $alter_money = $appoint_money;
+        } else {
+            //再去查询变更前的 金额
+            $alter_money = Db::name("user")->where('uid', $user_id)->value($type);
+        }
+        if ($change_status == 1) {
+            //新增前
+            $alter_money = $alter_money - $money;
+        } else if ($change_status == 2) {
+            //减少前
+            $alter_money = $alter_money + $money;
+        }
+        if ($alter_money < 0) {
+            $alter_money = 0;
+        }
+        $inser_data = [];
+        $inser_data['user_id'] = $user_id;
+        $inser_data['type'] = $transition[$type];
+        $inser_data['change_status'] = $change_status;
+        $inser_data['money'] = $money;
+        $inser_data['routine_log_of_key_id'] = $key_id;
+        $inser_data['remark'] = $remark;
+        $inser_data['is_admin'] = $is_admin;
+        $inser_data['create_time'] = time();
+        $inser_data['alter_money'] = isset($alter_money) ? $alter_money : 0;
+        Db::name("old_user_log")->insert($inser_data);
+    }
+
+    //添加平台分佣2.0系统收益明细日志(养老金金额)
+    public function bill_user_log111111($uid, $name, $num, $mark, $comm)
+    {
+
+        $con_data = Db::name('user')->where("uid", $uid)->find();
+        //如果是会员专区就即刻到账
+
+        // Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
+
+
+        $bill = [
+            'uid' => $uid,
+            'link_id' => 0,//关联订单id
+            'pm' => 1,//0：支出，1：获得
+            'title' => $name,//账单标题
+            'category' => 'now_money',//明细种类
+            'type' => 'commission',//明细类型
+            'number' => $num,//明细数字
+            'balance' => 0,//剩余
+            'mark' => $mark,//备注
+            'create_time' => date('Y-m-d H:i:s'),//添加时间
+            'status' => 1,//0待确定，1有效，-1无效
+            'commission_type' => $comm,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
+            //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
+            //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
+            'order_sn' => 0,//订单号
+            'tripartite' => 0,//
+            'type_shop' => 0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
+            'mer_id' => 0,//商户id
+            'source' => 0,//1线下 0线上
+            'order_type' => 1,//1自营  2 第三方  订单类型
+            'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
+            'gzc' => 3,//养老金是否已进入公证处log表0：未进入。1：已进入
+            'take_time' => '',//结算时间
+            'district_id' => '',//
+            'street_id' => '',//
+            'month' => '',//月份
+
+
+        ];
+
+        Db::name('user_bill')->insert($bill);
+    }
+
+    //添加复购金
+    public function fugou_user_log($uid, $num, $order_id, $type_inc_des, $status = -1)
+    {
+
+        $fugou_data = Db::name('user')->where("uid", $uid)->find();
+
+
+        $bill = [
+            'uid' => $uid,
+            'number' => $num,//数量
+            'status' => $status,//复购金状态1-有效 0-失效 -1待确认
+            'mark' => "复购金",//备注
+            'desc' => "10%复购金",//描述
+            'order_id' => $order_id,//订单id
+            'surplus' => 0,//剩余
+            'order_type' => 11,//关联订单ID
+            'type' => $type_inc_des,//复购金类型 :1赠送，2消耗
+            'settlement_time' => date('Y-m-d H:i:s'),//添加时间,
+            'addtime' => time(),
+        ];
+
+        Db::name('user_sign_fugou')->insert($bill);
+    }
+}

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

@@ -72,8 +72,8 @@ class Taskorder extends BaseController
     public function lst1()
     {
 
-       return;
-   
+        return;
+
         // $user_datas = Db::name("user")->select();//星级等级
         // foreach($user_datas as $k=>$v){
         //     if($v['user_level_id_old']==2){
@@ -83,28 +83,28 @@ class Taskorder extends BaseController
         //     }
         // }
 
-         // 查询当前用户及其子级的所有订单
+        // 查询当前用户及其子级的所有订单
         //$totalPv = $this->getTeamPvByTime('this_week');
 
-    
-    //    var_dump($totalPv);return;    
-    
+
+        //    var_dump($totalPv);return;
+
         // $sf = $this->getStarLevel(221);
- 
+
         //$ss = $this->getbig_samll_datas(17);//222
         //var_dump($ss);
-          //$ff = $this->getPerformanceOf(221);
-         // var_dump($ff);
-    //var_dump($ss);   
-          // return;
-      
-     
+        //$ff = $this->getPerformanceOf(221);
+        // var_dump($ff);
+        //var_dump($ss);
+        // return;
+
+
         // $store_product_datas = Db::name('old_user_of_goods_old')->select();
-       
+
         //$week_record = 45500 + 1400 + 60000; //20250218
         //$week_record =23800 + 60000; //20250222
-       // $week_record = 64400; //20250301
-        
+        // $week_record = 64400; //20250301
+    }
 
     //添加复购金
     public function fugou_user_log($uid,$num,$order_id,$type_inc_des,$status=-1){

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

@@ -4,6 +4,7 @@
  * @Author: Qinii
  * @Date: 2020/5/28
  */
+
 namespace app\controller\api\store\merchant;
 
 use think\App;
@@ -17,87 +18,165 @@ class Taskorderguquan extends BaseController
 {
 
 
-
-
     public function lst6()
     {
 
-       return;
-
-        // return;
-
-        // $store_product_datas = Db::name('old_user_of_goods_old')->select();
-
-        //$week_record = 45500 + 60000 + 1400;
-
-        //$week_record = 23800 + 60000;//20250222
-
-       // $week_record = 64400;//20250303
-
-       
-
-
+        $week_record = 10500 + 50000; //20250310
+
+        // 查询测试人员账号信息
+        //18973958920
+        //15186694339
+        //18833633835
+        //19525470098
+        //17756507016
+        //18226705337
+        $testAccount = ['18973958920', '15186694339', '18833633835', '19525470098', '17756507016', '18226705337'];
+        $removeUserList = Db::name("user")
+            ->whereIn('account', $testAccount)
+            ->where("status", "<>", 0)
+            ->where('is_del', '<>', 1)
+            ->select()
+            ->toArray();
+        $removeUserIdList = array_column($removeUserList, 'uid');
+        // 定义分红金额
+        $week_record = $this->getTeamPvByTime('last_week', $removeUserIdList);
+        // 分红金额 - 红包金额
+        $redEnvelope = $this->getRedEnvelopeByTime('last_week', $removeUserIdList);
+
+        $week_record -= $redEnvelope;
+
+
+        $stock_comm = round($week_record * 0.05 ,2);
+
+
+        //获取股权分红的人
+
+        $GetAllUserPackNum = db::name("old_user_stock")->sum("pack");//计算所有用户的份数总和
+
+        $stockuserdatas = db::name("old_user_stock")->select();//获取所有用户
+
+        if(count($stockuserdatas) > 0){
+            $one_pack_comm_data = round($stock_comm / $GetAllUserPackNum,2);//获取每份的单佣金
+
+            foreach ($stockuserdatas as &$v) {
+                $v['getcomm'] = $v['pack'] * $one_pack_comm_data;
+                $v['allgetcomm'] =  $v['allgetcomm'] + $v['getcomm'];
+                $v['update_time'] = time();
+
+                $yj_90 = $v['getcomm'] * 0.9;
+                $fg_10 = $v['getcomm'] * 0.1;
+
+                // // 更新 user_stock 表中的记录
+                $res = db::name("old_user_stock")->where("id", $v['id'])->update([
+                    'getcomm' => $v['getcomm'],
+                    'allgetcomm' => $v['allgetcomm'],
+                    'update_time' => $v['update_time']
+                ]);
+
+                Db::name("user")->where("uid",$v['user_id'])->inc("brokerage_price", $yj_90)->save();
+                $res1 = Db::name("user")->where("uid",$v['user_id'])->inc("total_amount_old", $yj_90)->save();
+                $res2 = Db::name("user")->where("uid",$v['user_id'])->inc("amount_old", $yj_90)->save();
+
+                $res3 = Db::name("user")->where("uid",$v['user_id'])->inc("fugou", $fg_10)->save();
+
+                $res =true;
+                if($res){
+                    $das = $this->change_user_log($v['user_id'],'amount_old',1, $yj_90,"member_award_stock","股权分红入账"."-".$v['pack']);//释放佣金
+
+                    //入账星级分红记录表
+                    $week_data = [];
+                    $week_data['user_id'] =  $v['user_id'];
+                    $week_data['user_star_id'] =  0;
+                    $week_data['award_num'] =  0;
+                    $week_data['award_num_sm'] =  0;
+                    $week_data['remark'] =  "股权分红主动执行" . $yj_90;
+                    $week_data['week_record'] =  $week_record;
+                    $week_data['all_amount'] =  $stock_comm;
+                    $week_data['radio'] =  2;
+                    $week_data['owner_bill'] =  0;  //总流水金额
+                    $week_data['my_bill'] = 0;  //我的流水
+                    $week_data['create_time'] = time();
+
+
+                    Db::name("old_user_weekaward")->insert($week_data);
+
+                    $userdatassss = db::name("old_user_jbp")->where("id",$v['user_id'])->find();
+                    $datas_log = [
+                        'note'=>"名称:".  $userdatassss['nick_name']  . " 用户:".  $v['user_id'] . " 新增股权佣金:" .  $yj_90,
+                        'create_time'=>date('Y-m-d H:i:s')
+                    ];
+                    $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
+
+                    $this->bill_user_log111111($v['user_id'],"股权分佣",  $yj_90,"股权明细入账",13);//股权分佣明细2.0系统
+
+                    $this->fugou_user_log($v['user_id'],$fg_10,16,1,1);//复购金明细入账
+                }
+            }
+        }
+        //股权分红 end
     }
 
-       //添加复购金
-       public function fugou_user_log($uid,$num,$order_id,$type_inc_des,$status=-1){
+    //添加复购金
+    public function fugou_user_log($uid, $num, $order_id, $type_inc_des, $status = -1)
+    {
+
+        $fugou_data = Db::name('user')->where("uid", $uid)->find();
 
-        $fugou_data = Db::name('user')->where("uid",$uid)->find();
-       
 
         $bill = [
-            'uid'=>$uid,
-            'number'=>$num,//数量
-            'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
-            'mark'=>"复购金",//备注
-            'desc'=>"10%作为复购金",//描述
-            'order_id'=>$order_id,//订单id
-            'surplus'=>0,//剩余
-            'order_type'=>11,//关联订单ID
-            'type'=>$type_inc_des,//复购金类型 :1赠送，2消耗
-            'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
-            'addtime'=>time(),
+            'uid' => $uid,
+            'number' => $num,//数量
+            'status' => $status,//复购金状态1-有效 0-失效 -1待确认
+            'mark' => "复购金",//备注
+            'desc' => "10%作为复购金",//描述
+            'order_id' => $order_id,//订单id
+            'surplus' => 0,//剩余
+            'order_type' => 11,//关联订单ID
+            'type' => $type_inc_des,//复购金类型 :1赠送，2消耗
+            'settlement_time' => date('Y-m-d H:i:s'),//添加时间,
+            'addtime' => time(),
         ];
 
         Db::name('user_sign_fugou')->insert($bill);
     }
 
     //添加平台分佣2.0系统收益明细日志(养老金金额)
-    public function bill_user_log111111($uid,$name,$num,$mark,$comm){
+    public function bill_user_log111111($uid, $name, $num, $mark, $comm)
+    {
 
-        $con_data = Db::name('user')->where("uid",$uid)->find();
+        $con_data = Db::name('user')->where("uid", $uid)->find();
         //如果是会员专区就即刻到账
 
         // Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
 
 
         $bill = [
-            'uid'=>$uid,
-            'link_id'=>0,//关联订单id
-            'pm'=>1,//0：支出，1：获得
-            'title'=>$name,//账单标题
-            'category'=>'now_money',//明细种类
-            'type'=>'commission',//明细类型
-            'number'=>$num,//明细数字
-            'balance'=>0,//剩余
-            'mark'=>$mark,//备注
-            'create_time'=>date('Y-m-d H:i:s'),//添加时间
-            'status'=>1,//0待确定，1有效，-1无效
-            'commission_type'=>$comm,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
+            'uid' => $uid,
+            'link_id' => 0,//关联订单id
+            'pm' => 1,//0：支出，1：获得
+            'title' => $name,//账单标题
+            'category' => 'now_money',//明细种类
+            'type' => 'commission',//明细类型
+            'number' => $num,//明细数字
+            'balance' => 0,//剩余
+            'mark' => $mark,//备注
+            'create_time' => date('Y-m-d H:i:s'),//添加时间
+            'status' => 1,//0待确定，1有效，-1无效
+            'commission_type' => $comm,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
             //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
             //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
-            'order_sn'=>0,//订单号
-            'tripartite'=>0,//
-            'type_shop'=>0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
-            'mer_id'=>0,//商户id
-            'source'=>0,//1线下 0线上
-            'order_type'=>1,//1自营  2 第三方  订单类型
-            'is_red_brokerage'=>0,//1红积分对冲佣金 0正常佣金
-            'gzc'=>3,//养老金是否已进入公证处log表0：未进入。1：已进入
-            'take_time'=>'',//结算时间
-            'district_id'=>'',//
-            'street_id'=>'',//
-            'month'=>'',//月份
+            'order_sn' => 0,//订单号
+            'tripartite' => 0,//
+            'type_shop' => 0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
+            'mer_id' => 0,//商户id
+            'source' => 0,//1线下 0线上
+            'order_type' => 1,//1自营  2 第三方  订单类型
+            'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
+            'gzc' => 3,//养老金是否已进入公证处log表0：未进入。1：已进入
+            'take_time' => '',//结算时间
+            'district_id' => '',//
+            'street_id' => '',//
+            'month' => '',//月份
 
 
         ];
@@ -105,41 +184,41 @@ class Taskorderguquan extends BaseController
         Db::name('user_bill')->insert($bill);
     }
 
-    
+
     //发放佣金 示例: $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)
+    function change_user_log($user_id, $type, $change_status, $money, $routine, $remark = "", $is_admin = 1, $appoint_money = 0)
     {
         $transition = [
-            'pv'=>1,
-            "gb"=>2,
-            "df"=>3,
-            "vr"=>4,
-            "bt"=>5,
-            "withdraw_quota_old"=>6,//提现
-            "unsettled_pension"=>7,
-            "amount_old"=>8//发放佣金
+            'pv' => 1,
+            "gb" => 2,
+            "df" => 3,
+            "vr" => 4,
+            "bt" => 5,
+            "withdraw_quota_old" => 6,//提现
+            "unsettled_pension" => 7,
+            "amount_old" => 8//发放佣金
         ];
-        $routineInfo = Db::name("old_routine_log_of_key")->where("key",$routine)->find();
-        if(empty($routineInfo)) {
+        $routineInfo = Db::name("old_routine_log_of_key")->where("key", $routine)->find();
+        if (empty($routineInfo)) {
             return false;
         }
         $key_id = isset($routineInfo['id']) ? $routineInfo['id'] : 0;
 
-        if($appoint_money > 0) {
+        if ($appoint_money > 0) {
             $alter_money = $appoint_money;
-        }else{
+        } else {
             //再去查询变更前的 金额
-            $alter_money = Db::name("user")->where('uid',$user_id)->value($type);
+            $alter_money = Db::name("user")->where('uid', $user_id)->value($type);
         }
-        if($change_status == 1) {
+        if ($change_status == 1) {
             //新增前
-            $alter_money = $alter_money-$money;
-        }else if($change_status == 2){
+            $alter_money = $alter_money - $money;
+        } else if ($change_status == 2) {
             //减少前
             $alter_money = $alter_money + $money;
         }
-        if($alter_money < 0) {
-            $alter_money =0;
+        if ($alter_money < 0) {
+            $alter_money = 0;
         }
         $inser_data = [];
         $inser_data['user_id'] = $user_id;
@@ -154,6 +233,79 @@ class Taskorderguquan extends BaseController
         Db::name("old_user_log")->insert($inser_data);
     }
 
+    public function getTime($timePeriod)
+    {
+        // 定义时间区间
+        $now = time();
+        $startTime = '';
+        $endTime = '';
+        if ($timePeriod == 'last_week') {
+            // 上周的时间区间
+            $startTime = date('Y-m-d', strtotime('monday last week', $now)); // 上周星期一的开始时间
+            $endTime = date('Y-m-d', strtotime('sunday last week', $now)); // 上周星期日的结束时间
+        } elseif ($timePeriod == 'this_week') {
+            // 这周的时间区间
+            $startTime = date('Y-m-d', strtotime('monday this week', $now)); // 这周星期一的开始时间
+            $endTime = date('Y-m-d', strtotime('sunday this week', $now)); // 这周星期日的结束时间
+        }
+        //        return ['startTime' => '2025-03-10', 'endTime' => '2025-03-23'];
+        return ['startTime' => $startTime, 'endTime' => $endTime];
+    }
+
+    public function getTeamPvByTime($timePeriod = 'last_week', $removeUserIdList = [])
+    {
+        $timeMap = $this->getTime($timePeriod);
+        $startTime = $timeMap['startTime'];
+        $endTime = $timeMap['endTime'];
+
+        // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
+        $orders = Db::name("store_order")
+            ->where('mer_id', 496)
+            ->whereNotIn('uid', $removeUserIdList)
+            ->whereIn('status', [0, 1, 2, 3])
+            ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
+            ->whereBetween("pay_time", [$startTime . ' 00:00:00', $endTime . ' 23:59:59'])
+            ->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;
+    }
 
+    public function getRedEnvelopeByTime($timePeriod = 'last_week', $removeUserIdList = [])
+    {
+        $timeMap = $this->getTime($timePeriod);
+        $startTime = $timeMap['startTime'];
+        $endTime = $timeMap['endTime'];
+
+        // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
+        $redEnvelopeList = Db::name("user_sign_hongbao")
+            ->whereNotIn('uid', $removeUserIdList)
+            ->where('status', 1)
+            ->whereBetween("settlement_time", [$startTime . ' 00:00:00', $endTime . ' 23:59:59'])
+            ->select()
+            ->toArray();
+        return floor(array_sum(array_column($redEnvelopeList, 'number')) * 100) / 100;
+    }
 }

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

@@ -4,6 +4,7 @@
  * @Author: Qinii
  * @Date: 2020/5/28
  */
+
 namespace app\controller\api\store\merchant;
 
 use think\App;
@@ -19,14 +20,14 @@ class Taskorderlianc extends BaseController
     /**
      * 会员升级
      */
-    public function member_update($orderInfo,$goods_of_info,$user_id)
+    public function member_update($orderInfo, $goods_of_info, $user_id)
     {
         //
         //$user_id = $userInfo['id'];
         $order_id = $orderInfo['id'];
 
         //code...
-        $pay_gb =  round($orderInfo['num'] * $orderInfo['gb_num'],2);
+        $pay_gb = round($orderInfo['num'] * $orderInfo['gb_num'], 2);
         //$pay_vr =  round($orderInfo['num'] * $orderInfo['vr_num'],2);
         //付款按照700的VR付款 start
         $vr_num = 0;
@@ -36,14 +37,13 @@ class Taskorderlianc extends BaseController
             $vr_num = 7000;
         } elseif ($orderInfo['price'] == 11800) {
             $vr_num = 2100;
-        }elseif($orderInfo['price'] == 10620){
+        } elseif ($orderInfo['price'] == 10620) {
             $vr_num = 6300;
         }
 
 
-
         $pay_gb1 = $vr_num;
-        $pay_vr1 =$orderInfo['price'];//记录VR值
+        $pay_vr1 = $orderInfo['price'];//记录VR值
 
 
         // $result = Db::name("old_user_jbp")->where("id",$user_id)->dec("vr",$orderInfo['price'])->save();//1.0jbp旧表
@@ -51,43 +51,41 @@ class Taskorderlianc extends BaseController
 
 
         $result = true;
-        if($result) {
+        if ($result) {
             $invite_id = $goods_of_info['spread_id'];
 
 
             $zs_ylj = 0; //养老金赋值
 
 
-            if($goods_of_info['money'] == 1180){
+            if ($goods_of_info['money'] == 1180) {
                 //修改订单到账状态
-                $zs_ylj = round(700 * 0.05,2);//计算的养老金 金额
-            }elseif($goods_of_info['money'] == 11800){
-                $zs_ylj = round(7000 * 0.05,2);//计算的养老金 金额
-            }elseif($goods_of_info['money'] == 3540){
-                $zs_ylj = round(2100 * 0.05,2);//计算的养老金 金额
-            }elseif($goods_of_info['money'] == 10620){
-                $zs_ylj = round(6300 * 0.05,2);//计算的养老金 金额
-            }elseif($goods_of_info['money'] == 9440){
-                $zs_ylj = round(5600 * 0.05,2);//八单计算的养老金 金额
-            }elseif($goods_of_info['money'] == 2360){
-                $zs_ylj = round(1400 * 0.05,2);//两单计算的养老金 金额
+                $zs_ylj = round(700 * 0.05, 2);//计算的养老金 金额
+            } elseif ($goods_of_info['money'] == 11800) {
+                $zs_ylj = round(7000 * 0.05, 2);//计算的养老金 金额
+            } elseif ($goods_of_info['money'] == 3540) {
+                $zs_ylj = round(2100 * 0.05, 2);//计算的养老金 金额
+            } elseif ($goods_of_info['money'] == 10620) {
+                $zs_ylj = round(6300 * 0.05, 2);//计算的养老金 金额
+            } elseif ($goods_of_info['money'] == 9440) {
+                $zs_ylj = round(5600 * 0.05, 2);//八单计算的养老金 金额
+            } elseif ($goods_of_info['money'] == 2360) {
+                $zs_ylj = round(1400 * 0.05, 2);//两单计算的养老金 金额
             }
 
 
-
-
             $uid = $user_id;
             $new_user_id = $uid;
-            if(empty($new_user_id)) {
-                abort(0,"当前绑定会员查询错误");
+            if (empty($new_user_id)) {
+                abort(0, "当前绑定会员查询错误");
             }
 
-            $new_nums =Db::name("old_user_of_goods")->where("user_id", $uid)->sum("money");
+            $new_nums = Db::name("old_user_of_goods")->where("user_id", $uid)->sum("money");
 
             //增加过后权益对比 获取当前权益等级
-            $old_level_id = Db::name("old_user_jbp")->where("id",$uid)->find();
+            $old_level_id = Db::name("old_user_jbp")->where("id", $uid)->find();
 
-            $old_level_info = Db::name("old_user_level")->where("id",$old_level_id['user_level_id'])->find();
+            $old_level_info = Db::name("old_user_level")->where("id", $old_level_id['user_level_id'])->find();
 
 
             $level_info = [];
@@ -97,8 +95,8 @@ class Taskorderlianc extends BaseController
             //计算会员等级 升级
             foreach ($level_list as $key => $value) {
                 # code...
-                if($new_nums>=$value['money']) {
-                    $level_info =  $value;
+                if ($new_nums >= $value['money']) {
+                    $level_info = $value;
                     break;
                 }
             }
@@ -107,21 +105,20 @@ class Taskorderlianc extends BaseController
             $zs_withdraw_quota = $orderInfo['price'];
 
 
-            if($old_level_info['id'] == $level_info['id']) {
+            if ($old_level_info['id'] == $level_info['id']) {
                 //未到达升级权益 不改变用户等级
                 $update_status = false;
-            }else{
+            } else {
                 $update_status = true;
                 $user_level = $level_info['id'];
                 //var_dump( $user_level);
-                Db::name("old_user_jbp")->where("id",$new_user_id)->save(['user_level_id'=>$user_level]);//1.0jbp旧表
-                Db::name("user")->where("uid",$new_user_id)->save(['user_level_id_old'=>$user_level]);//2.0新表
+                Db::name("old_user_jbp")->where("id", $new_user_id)->save(['user_level_id' => $user_level]);//1.0jbp旧表
+                Db::name("user")->where("uid", $new_user_id)->save(['user_level_id_old' => $user_level]);//2.0新表
 
                 // todo 同时改变他的权益
             }
 
 
-
             // Db::name("old_user_jbp")->where("id",$new_user_id)->inc("withdraw_quota",$zs_withdraw_quota)->save();//1.0jbp旧表
             // Db::name("user")->where("uid",$new_user_id)->save(['withdraw_quota_old'=>$zs_withdraw_quota]);//2.0新表
 
@@ -135,55 +132,54 @@ class Taskorderlianc extends BaseController
 
 
             //检查是不是订单价格是1180或者11800，更改VR
-            if($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440  || $goods_of_info['money'] == 2360){
+            if ($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440 || $goods_of_info['money'] == 2360) {
                 //修改订单到账状态
 
 
-                Db::name("old_user_of_goods")->where("order_id",$goods_of_info1['id'])->save(['status'=>1,'pay_gb'=>0,'pay_vr'=>$pay_vr1,'pay_bt'=>0,'create_time'=>time()]);
+                Db::name("old_user_of_goods")->where("order_id", $goods_of_info1['id'])->save(['status' => 1, 'pay_gb' => 0, 'pay_vr' => $pay_vr1, 'pay_bt' => 0, 'create_time' => time()]);
 
 
             }
         }
 
 
-
-        if($result) {
+        if ($result) {
             //更改订单状态
 
             Db::commit();
-            $new_user_name = Db::name("old_user_jbp")->where("id",$new_user_id)->value("user_name");
+            $new_user_name = Db::name("old_user_jbp")->where("id", $new_user_id)->value("user_name");
             $new_user_name = empty($new_user_name) ? "" : $new_user_name;
 
             //记录日志信息
 
-            if($user_id == $invite_id) {
+            if ($user_id == $invite_id) {
                 //报单中心=推荐人 GB记录日志有问题需要传入指定参数去计算
                 //$money = Db::name("old_user_jbp")->where("id",$user_id)->value("gb");
                 //$appoint_money = $money - $zs_invite_gb;
 
-                if($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440  || $goods_of_info['money'] == 2360){
+                if ($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440 || $goods_of_info['money'] == 2360) {
 
 
-                    $this->change_user_log66($user_id,"vr",2,$pay_vr1,"declare_expend",'权益消费VR-'.$new_user_name);
+                    $this->change_user_log66($user_id, "vr", 2, $pay_vr1, "declare_expend", '权益消费VR-' . $new_user_name);
 
                 }
-            }else{
+            } else {
 
-                if($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440  || $goods_of_info['money'] == 2360){
+                if ($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440 || $goods_of_info['money'] == 2360) {
 
 
-                    $this->change_user_log66($user_id,"vr",2,$pay_vr1,"declare_expend",'权益消费VR-'.$new_user_name);
+                    $this->change_user_log66($user_id, "vr", 2, $pay_vr1, "declare_expend", '权益消费VR-' . $new_user_name);
 
                 }
             }
             // $this->change_user_log66($new_user_id,'gb',1,$zs_gb,"levle_update_zs","权益升级达标赠送");
-            $this->change_user_log66($new_user_id,'withdraw_quota_old',1,$zs_withdraw_quota,"levle_update_zs","权益升级达标赠送");
+            $this->change_user_log66($new_user_id, 'withdraw_quota_old', 1, $zs_withdraw_quota, "levle_update_zs", "权益升级达标赠送");
             // $this->change_user_log66($invite_id,'gb',1,$zs_invite_gb,"levle_update_zs","邀请-".$new_user_name);
             // echo 123;return;
             //处理查看是否有待发放佣金
             // $zs_withdraw_quota
-            Db::name("old_user_jbp")->where("id",$new_user_id)->inc("total_withdraw_quota",$zs_withdraw_quota)->save();//1.0jbp旧表
-            Db::name("user")->where("uid",$new_user_id)->inc("total_withdraw_quota_old",$zs_withdraw_quota)->save();
+            Db::name("old_user_jbp")->where("id", $new_user_id)->inc("total_withdraw_quota", $zs_withdraw_quota)->save();//1.0jbp旧表
+            Db::name("user")->where("uid", $new_user_id)->inc("total_withdraw_quota_old", $zs_withdraw_quota)->save();
             // $this->releaseTobeAmount($new_user_id,$zs_withdraw_quota);
             // $this->success("支付成功",['is_cash'=>0]);
         }
@@ -191,34 +187,34 @@ class Taskorderlianc extends BaseController
         // $this->error("操作失败");
     }
 
-    function change_user_log66($user_id,$type,$change_status,$money,$routine,$remark="",$is_admin=1,$appoint_money = 0)
+    function change_user_log66($user_id, $type, $change_status, $money, $routine, $remark = "", $is_admin = 1, $appoint_money = 0)
     {
         $transition = [
-            'pv'=>1,
-            "gb"=>2,
-            "df"=>3,
-            "vr"=>4,
-            "bt"=>5,
-            "withdraw_quota_old"=>6,
-            "unsettled_pension"=>7,
-            "amount_old"=>8
+            'pv' => 1,
+            "gb" => 2,
+            "df" => 3,
+            "vr" => 4,
+            "bt" => 5,
+            "withdraw_quota_old" => 6,
+            "unsettled_pension" => 7,
+            "amount_old" => 8
         ];
-        $routineInfo = Db::name("old_routine_log_of_key")->where("key",$routine)->find();
-        if(empty($routineInfo)) {
+        $routineInfo = Db::name("old_routine_log_of_key")->where("key", $routine)->find();
+        if (empty($routineInfo)) {
             return false;
         }
         $key_id = isset($routineInfo['id']) ? $routineInfo['id'] : 0;
         //再去查询变更前的 金额
-        if($appoint_money > 0) {
+        if ($appoint_money > 0) {
             $alter_money = $appoint_money;
-        }else{
+        } else {
             //再去查询变更前的 金额
-            $alter_money = Db::name("user")->where('uid',$user_id)->value($type);
+            $alter_money = Db::name("user")->where('uid', $user_id)->value($type);
         }
-        if($change_status == 1) {
+        if ($change_status == 1) {
             //新增前
-            $alter_money = $alter_money-$money;
-        }else if($change_status == 2){
+            $alter_money = $alter_money - $money;
+        } else if ($change_status == 2) {
             //减少前
             $alter_money = $alter_money + $money;
         }
@@ -231,46 +227,47 @@ class Taskorderlianc extends BaseController
         $inser_data['remark'] = $remark;
         $inser_data['is_admin'] = $is_admin;
         $inser_data['create_time'] = time();
-        $inser_data['alter_money'] =  isset($alter_money) ? $alter_money : 0;
+        $inser_data['alter_money'] = isset($alter_money) ? $alter_money : 0;
         Db::name("old_user_log")->insert($inser_data);
     }
 
     //添加推广佣金/养老金日志(养老金金额)
-    public function bill_user_log($uid,$name,$num,$mark){
+    public function bill_user_log($uid, $name, $num, $mark)
+    {
 
-        $con_data = Db::name('user')->where("uid",$uid)->find();
+        $con_data = Db::name('user')->where("uid", $uid)->find();
         //如果是会员专区就即刻到账
 
-        Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
+        Db::name('user')->where("uid", $con_data['uid'])->update(['brokerage_price' => $con_data['brokerage_price'] + $num]);
 
 
         $bill = [
-            'uid'=>$uid,
-            'link_id'=>0,//关联订单id
-            'pm'=>1,//0：支出，1：获得
-            'title'=>$name,//账单标题
-            'category'=>'now_money',//明细种类
-            'type'=>'commission',//明细类型
-            'number'=>$num,//明细数字
-            'balance'=>0,//剩余
-            'mark'=>$mark,//备注
-            'create_time'=>date('Y-m-d H:i:s'),//添加时间
-            'status'=>1,//0待确定，1有效，-1无效
-            'commission_type'=>8,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
+            'uid' => $uid,
+            'link_id' => 0,//关联订单id
+            'pm' => 1,//0：支出，1：获得
+            'title' => $name,//账单标题
+            'category' => 'now_money',//明细种类
+            'type' => 'commission',//明细类型
+            'number' => $num,//明细数字
+            'balance' => 0,//剩余
+            'mark' => $mark,//备注
+            'create_time' => date('Y-m-d H:i:s'),//添加时间
+            'status' => 1,//0待确定，1有效，-1无效
+            'commission_type' => 8,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
             //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
             //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
-            'order_sn'=>0,//订单号
-            'tripartite'=>0,//
-            'type_shop'=>0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
-            'mer_id'=>0,//商户id
-            'source'=>0,//1线下 0线上
-            'order_type'=>1,//1自营  2 第三方  订单类型
-            'is_red_brokerage'=>0,//1红积分对冲佣金 0正常佣金
-            'gzc'=>3,//养老金是否已进入公证处log表0：未进入。1：已进入
-            'take_time'=>'',//结算时间
-            'district_id'=>'',//
-            'street_id'=>'',//
-            'month'=>'',//月份
+            'order_sn' => 0,//订单号
+            'tripartite' => 0,//
+            'type_shop' => 0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
+            'mer_id' => 0,//商户id
+            'source' => 0,//1线下 0线上
+            'order_type' => 1,//1自营  2 第三方  订单类型
+            'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
+            'gzc' => 3,//养老金是否已进入公证处log表0：未进入。1：已进入
+            'take_time' => '',//结算时间
+            'district_id' => '',//
+            'street_id' => '',//
+            'month' => '',//月份
 
 
         ];
@@ -279,77 +276,192 @@ class Taskorderlianc extends BaseController
     }
 
 
+    public function lst2()
+    {
+
 
+        $week_record = 10500 + 50000; //20250310
 
-    public function lst2(){
+        // 查询测试人员账号信息
+        //18973958920
+        //15186694339
+        //18833633835
+        //19525470098
+        //17756507016
+        //18226705337
+        $testAccount = ['18973958920', '15186694339', '18833633835', '19525470098', '17756507016', '18226705337'];
+        $removeUserList = Db::name("user")
+            ->whereIn('account', $testAccount)
+            ->where("status", "<>", 0)
+            ->where('is_del', '<>', 1)
+            ->select()
+            ->toArray();
+        $removeUserIdList = array_column($removeUserList, 'uid');
+        // 定义分红金额
+        $week_record = $this->getTeamPvByTime('last_week', $removeUserIdList);
+        // 分红金额 - 红包金额
+        $redEnvelope = $this->getRedEnvelopeByTime('last_week', $removeUserIdList);
 
+        $week_record -= $redEnvelope;
 
 
+        $originator_award = round(($week_record * 0.05), 2);
 
+        $list = Db::name("user")->where("originator_id_old", ">", 0)->where("status", 1)->field("uid,originator_id_old")->select()->toArray();
 
+        // foreach($list as $k=>$v){
+        //     var_dump($v);
+        // }
 
+        // return;
 
-    }
+        $sum_money = Db::name("old_user_lianc")->sum("number");
+
+        $lianc_list = Db::name("old_user_lianc")->order("id desc")->field("id,number,title")->select()->toArray();
+        $user_arr = [];
+
+        $lianc_list_arr = [];
+        foreach ($lianc_list as $key => $value) {
+            # code...
+            $lianc_list_arr[$value['id']] = $value;
+        }
 
-        //添加复购金
-        public function fugou_user_log($uid,$num,$order_id,$type_inc_des,$status=-1){
-
-            $fugou_data = Db::name('user')->where("uid",$uid)->find();
-           
-    
-            $bill = [
-                'uid'=>$uid,
-                'number'=>$num,//数量
-                'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
-                'mark'=>"复购金",//备注
-                'desc'=>"10%作为复购金",//描述
-                'order_id'=>$order_id,//订单id
-                'surplus'=>0,//剩余
-                'order_type'=>11,//关联订单ID
-                'type'=>$type_inc_des,//复购金类型 :1赠送，2消耗
-                'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
-                'addtime'=>time(),
-            ];
-    
-            Db::name('user_sign_fugou')->insert($bill);
+        foreach ($list as $key => $value) {
+            # code...
+            $user_arr[$value['originator_id_old']]['people'][] = $value['uid'];
+            $user_arr[$value['originator_id_old']]['money'] = $lianc_list_arr[$value['originator_id_old']]['number'];
+            $user_arr[$value['originator_id_old']]['title'] = $lianc_list_arr[$value['originator_id_old']]['title'];
+            $user_arr[$value['originator_id_old']]['id'] = $lianc_list_arr[$value['originator_id_old']]['id'];
         }
 
+
+        //处理计算权重 和平均分配的金额
+        $total_num = 0;
+        $count_num = 0;
+        foreach ($user_arr as $key => $value) {
+            # code...
+            $total_num += round($value['money'] * count($value['people']) / 1000, 2);
+            $count_num += count($value['people']);
+        }
+        foreach ($user_arr as $key => $value) {
+            # code...
+            $rate = round((count($value['people']) * $value['money']) / $total_num, 2) / 1000;
+            $user_arr[$key]['rate'] = $rate;
+            $distribution_money = round($originator_award * $rate, 2);
+            $user_arr[$key]['distribution_money'] = $distribution_money;
+            $user_arr[$key]['people_award'] = round($distribution_money / count($value['people']), 2);//可分配佣金
+        }
+
+        $count = 0;
+        foreach ($user_arr as $key => $value) {
+            $distribution_money = $value['distribution_money'];
+            # code...
+            foreach ($value['people'] as $k => $v) {
+                # code...
+                $award = $value['people_award'];
+
+                //90给佣金，10给复购金
+                $yj_90 = $award * 0.9;
+                $fg_10 = $award * 0.1;
+
+                Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
+                $res = Db::name("user")->where("uid", $v)->inc("total_amount_old", $yj_90)->save();
+                Db::name("user")->where("uid", $v)->inc("amount_old", $yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
+                $res3 = Db::name("user")->where("uid", $v)->inc("fugou", $fg_10)->save();
+
+                $res = true;
+                if ($res) {
+                    $$count = $count + 1;
+                    $this->change_user_log($v, 'amount_old', 1, $yj_90, "relation_profits", "联创分红入账" . "-" . $value['title']);
+                    //入账
+                    $week_data = [];
+                    $week_data['user_id'] = $v;
+                    $week_data['user_lianc_id'] = $value['id'];
+                    $week_data['money'] = $yj_90;
+                    $week_data['remark'] = "联创分红入账主动执行" . $yj_90;
+                    $week_data['all_record'] = $originator_award;
+                    $week_data['all_amount'] = $distribution_money;
+                    $week_data['create_time'] = time();
+                    Db::name("old_user_originator")->insert($week_data);
+
+                    $userdatassss = db::name("user")->where("uid", $v)->find();
+                    $datas_log = [
+                        'note' => "名称:" . $userdatassss['nickname'] . " 用户:" . $v . " 新增联创佣金:" . $yj_90,
+                        'create_time' => date('Y-m-d H:i:s')
+                    ];
+                    Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
+                    $this->bill_user_log111111($v, "联创分佣", $yj_90, "联创明细入账", 12);//股权分佣明细2.0系统
+
+                    $this->fugou_user_log($v, $fg_10, 16, 1, 1);//复购金明细入账
+
+                } else {
+                    // ..
+                }
+            }
+        }
+    }
+
+    //添加复购金
+    public function fugou_user_log($uid, $num, $order_id, $type_inc_des, $status = -1)
+    {
+
+        $fugou_data = Db::name('user')->where("uid", $uid)->find();
+
+
+        $bill = [
+            'uid' => $uid,
+            'number' => $num,//数量
+            'status' => $status,//复购金状态1-有效 0-失效 -1待确认
+            'mark' => "复购金",//备注
+            'desc' => "10%作为复购金",//描述
+            'order_id' => $order_id,//订单id
+            'surplus' => 0,//剩余
+            'order_type' => 11,//关联订单ID
+            'type' => $type_inc_des,//复购金类型 :1赠送，2消耗
+            'settlement_time' => date('Y-m-d H:i:s'),//添加时间,
+            'addtime' => time(),
+        ];
+
+        Db::name('user_sign_fugou')->insert($bill);
+    }
+
     //添加平台分佣2.0系统收益明细日志(养老金金额)
-    public function bill_user_log111111($uid,$name,$num,$mark,$comm){
+    public function bill_user_log111111($uid, $name, $num, $mark, $comm)
+    {
 
-        $con_data = Db::name('user')->where("uid",$uid)->find();
+        $con_data = Db::name('user')->where("uid", $uid)->find();
         //如果是会员专区就即刻到账
 
         // Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
 
 
         $bill = [
-            'uid'=>$uid,
-            'link_id'=>0,//关联订单id
-            'pm'=>1,//0：支出，1：获得
-            'title'=>$name,//账单标题
-            'category'=>'now_money',//明细种类
-            'type'=>'commission',//明细类型
-            'number'=>$num,//明细数字
-            'balance'=>0,//剩余
-            'mark'=>$mark,//备注
-            'create_time'=>date('Y-m-d H:i:s'),//添加时间
-            'status'=>1,//0待确定，1有效，-1无效
-            'commission_type'=>$comm,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
+            'uid' => $uid,
+            'link_id' => 0,//关联订单id
+            'pm' => 1,//0：支出，1：获得
+            'title' => $name,//账单标题
+            'category' => 'now_money',//明细种类
+            'type' => 'commission',//明细类型
+            'number' => $num,//明细数字
+            'balance' => 0,//剩余
+            'mark' => $mark,//备注
+            'create_time' => date('Y-m-d H:i:s'),//添加时间
+            'status' => 1,//0待确定，1有效，-1无效
+            'commission_type' => $comm,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
             //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
             //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
-            'order_sn'=>0,//订单号
-            'tripartite'=>0,//
-            'type_shop'=>0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
-            'mer_id'=>0,//商户id
-            'source'=>0,//1线下 0线上
-            'order_type'=>1,//1自营  2 第三方  订单类型
-            'is_red_brokerage'=>0,//1红积分对冲佣金 0正常佣金
-            'gzc'=>3,//养老金是否已进入公证处log表0：未进入。1：已进入
-            'take_time'=>'',//结算时间
-            'district_id'=>'',//
-            'street_id'=>'',//
-            'month'=>'',//月份
+            'order_sn' => 0,//订单号
+            'tripartite' => 0,//
+            'type_shop' => 0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
+            'mer_id' => 0,//商户id
+            'source' => 0,//1线下 0线上
+            'order_type' => 1,//1自营  2 第三方  订单类型
+            'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
+            'gzc' => 3,//养老金是否已进入公证处log表0：未进入。1：已进入
+            'take_time' => '',//结算时间
+            'district_id' => '',//
+            'street_id' => '',//
+            'month' => '',//月份
 
 
         ];
@@ -392,39 +504,39 @@ class Taskorderlianc extends BaseController
     // }
 
 
-    public function change_user_log($user_id,$type,$change_status,$money,$routine,$remark="",$is_admin=1,$appoint_money = 0)
+    public function change_user_log($user_id, $type, $change_status, $money, $routine, $remark = "", $is_admin = 1, $appoint_money = 0)
     {
         $transition = [
-            'pv'=>1,
-            "gb"=>2,
-            "df"=>3,
-            "vr"=>4,
-            "bt"=>5,
-            "withdraw_quota"=>6,
-            "unsettled_pension"=>7,
-            "amount_old"=>8
+            'pv' => 1,
+            "gb" => 2,
+            "df" => 3,
+            "vr" => 4,
+            "bt" => 5,
+            "withdraw_quota" => 6,
+            "unsettled_pension" => 7,
+            "amount_old" => 8
         ];
-        $routineInfo = Db::name("old_routine_log_of_key")->where("key",$routine)->find();
-        if(empty($routineInfo)) {
+        $routineInfo = Db::name("old_routine_log_of_key")->where("key", $routine)->find();
+        if (empty($routineInfo)) {
             return false;
         }
         $key_id = isset($routineInfo['id']) ? $routineInfo['id'] : 0;
 
-        if($appoint_money > 0) {
+        if ($appoint_money > 0) {
             $alter_money = $appoint_money;
-        }else{
+        } else {
             //再去查询变更前的 金额
-            $alter_money = Db::name("user")->where('uid',$user_id)->value($type);
+            $alter_money = Db::name("user")->where('uid', $user_id)->value($type);
         }
-        if($change_status == 1) {
+        if ($change_status == 1) {
             //新增前
-            $alter_money = $alter_money-$money;
-        }else if($change_status == 2){
+            $alter_money = $alter_money - $money;
+        } else if ($change_status == 2) {
             //减少前
             $alter_money = $alter_money + $money;
         }
-        if($alter_money < 0) {
-            $alter_money =0;
+        if ($alter_money < 0) {
+            $alter_money = 0;
         }
         $inser_data = [];
         $inser_data['user_id'] = $user_id;
@@ -440,60 +552,125 @@ class Taskorderlianc extends BaseController
     }
 
 
-
     /**
      * 释放待发放佣金
      */
-    public function releaseTobeAmount($user_id,$amount,$output)
+    public function releaseTobeAmount($user_id, $amount, $output)
     {
         $userInfo = Db::name("user")->find($user_id);
-        if(empty($userInfo)) {
+        if (empty($userInfo)) {
             return false;
         }
         $withdraw_quota = empty($userInfo['withdraw_quota_old']) ? 0 : $userInfo['withdraw_quota_old'];
         $old_amount = empty($userInfo['tobe_amount_old']) ? 0 : $userInfo['tobe_amount_old'];
-        Db::name("user")->where("uid",$user_id)->save(['tobe_amount_old'=>0]);
+        Db::name("user")->where("uid", $user_id)->save(['tobe_amount_old' => 0]);
         $amount += $old_amount;
         $inc_amount = 0;
         $inc_tobe_amount = 0;
         $dec_withdraw_quota = 0;
 
-        if(($amount - $withdraw_quota) > 0) {
+        if (($amount - $withdraw_quota) > 0) {
             $diff_money = $amount - $withdraw_quota;
             $inc_amount = $withdraw_quota;
             $dec_withdraw_quota = $withdraw_quota;
             $inc_tobe_amount = $diff_money;
-        }elseif(($amount - $withdraw_quota)==0){
+        } elseif (($amount - $withdraw_quota) == 0) {
             $inc_amount = $withdraw_quota;
             $dec_withdraw_quota = $withdraw_quota;
-        }else {
+        } else {
             // <0的情况
             $diff_money = $withdraw_quota - $amount;
             $inc_amount = $amount;
             $dec_withdraw_quota = $amount;
         }
-        if($inc_tobe_amount != 0 ) {
+        if ($inc_tobe_amount != 0) {
 
-            $res = Db::name("user")->where("uid",$user_id)->inc("tobe_amount_old",$inc_tobe_amount)->fetchSql()->inc("amount",$inc_amount)->dec("withdraw_quota_old",$dec_withdraw_quota)->save();
+            $res = Db::name("user")->where("uid", $user_id)->inc("tobe_amount_old", $inc_tobe_amount)->fetchSql()->inc("amount", $inc_amount)->dec("withdraw_quota_old", $dec_withdraw_quota)->save();
 
 
-
-        }else {
-            $res = Db::name("user")->where("uid",$user_id)->inc("amount_old",$inc_amount)->fetchSql()->dec("withdraw_quota_old",$dec_withdraw_quota)->save();
+        } else {
+            $res = Db::name("user")->where("uid", $user_id)->inc("amount_old", $inc_amount)->fetchSql()->dec("withdraw_quota_old", $dec_withdraw_quota)->save();
 
         }
         //记录日志 提现额度消费
-        if($dec_withdraw_quota > 0) {
-            $this->change_user_log($user_id,'withdraw_quota',2,$dec_withdraw_quota,"conversion_tobe_amount","佣金额度兑换佣金");
+        if ($dec_withdraw_quota > 0) {
+            $this->change_user_log($user_id, 'withdraw_quota', 2, $dec_withdraw_quota, "conversion_tobe_amount", "佣金额度兑换佣金");
         }
     }
 
+    public function getTime($timePeriod)
+    {
+        // 定义时间区间
+        $now = time();
+        $startTime = '';
+        $endTime = '';
+        if ($timePeriod == 'last_week') {
+            // 上周的时间区间
+            $startTime = date('Y-m-d', strtotime('monday last week', $now)); // 上周星期一的开始时间
+            $endTime = date('Y-m-d', strtotime('sunday last week', $now)); // 上周星期日的结束时间
+        } elseif ($timePeriod == 'this_week') {
+            // 这周的时间区间
+            $startTime = date('Y-m-d', strtotime('monday this week', $now)); // 这周星期一的开始时间
+            $endTime = date('Y-m-d', strtotime('sunday this week', $now)); // 这周星期日的结束时间
+        }
+        //        return ['startTime' => '2025-03-10', 'endTime' => '2025-03-23'];
+        return ['startTime' => $startTime, 'endTime' => $endTime];
+    }
 
+    public function getTeamPvByTime($timePeriod = 'last_week', $removeUserIdList = [])
+    {
+        $timeMap = $this->getTime($timePeriod);
+        $startTime = $timeMap['startTime'];
+        $endTime = $timeMap['endTime'];
+
+        // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
+        $orders = Db::name("store_order")
+            ->where('mer_id', 496)
+            ->whereNotIn('uid', $removeUserIdList)
+            ->whereIn('status', [0, 1, 2, 3])
+            ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
+            ->whereBetween("pay_time", [$startTime . ' 00:00:00', $endTime . ' 23:59:59'])
+            ->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;
+    }
 
-
-
-
-
-
+    public function getRedEnvelopeByTime($timePeriod = 'last_week', $removeUserIdList = [])
+    {
+        $timeMap = $this->getTime($timePeriod);
+        $startTime = $timeMap['startTime'];
+        $endTime = $timeMap['endTime'];
+
+        // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
+        $redEnvelopeList = Db::name("user_sign_hongbao")
+            ->whereNotIn('uid', $removeUserIdList)
+            ->where('status', 1)
+            ->whereBetween("settlement_time", [$startTime . ' 00:00:00', $endTime . ' 23:59:59'])
+            ->select()
+            ->toArray();
+        return floor(array_sum(array_column($redEnvelopeList, 'number')) * 100) / 100;
+    }
 }

app/controller/api/store/product/Su.php

@@ -26,8 +26,10 @@ class Su extends BaseController
     {
 
         parent::__construct($app);
-        $this->appKey = '8349fdf89e7c46ff8ba28752093dfd09';
-        $this->secretKey = '7c386c01da509065febddde9f87d4821';
+//        $this->appKey = '8349fdf89e7c46ff8ba28752093dfd09';
+//        $this->secretKey = '7c386c01da509065febddde9f87d4821';
+        $this->appKey = '7031e4de1179b326a904b9c2eec68eb1';
+        $this->secretKey = 'bf0c498b244aaca811c19742602c2d4d';
         $this->channel = '';
         $this->userThird = app()->make(UserThirdRepository::class);
     }

app/controller/api/user/User.php

@@ -219,10 +219,10 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_hongbao')->where($where)->where('type', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_hongbao')->where($where)->where(['type' => 1,'status' => 1])->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
-            $data = DB::name('user_sign_hongbao')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_hongbao')->where($where)->where(['type' => 2,'status' => 1])->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         if($pm==2){
@@ -1580,7 +1580,7 @@ class User extends BaseController
         $common_list = [];//小部门数据
         if(count($child_nums_Tree) && isset($child_nums_Tree[0]['children']) && count($child_nums_Tree[0]['children'])){
             //获取大部门的key
-            $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_pv')), array_column($child_nums_Tree, 'total_pv'));
+            $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_pv')), array_column($child_nums_Tree[0]['children'], 'total_pv'));
             foreach($child_nums_Tree[0]['children'] as $k=>$v){
                 if($k == $maxBalanceIndex){
                     $person_list[] = [

app/controller/api/user/UserMp.php

@@ -36,8 +36,11 @@ class UserMp extends BaseController
         //点餐小程序
         // $this->appid = 'wx10669a2eca032216';
         // $this->secret = '0e71d5c636fdb9bf1c79c403db70f739';
-        $this->appid = 'wx7b4d857deb0447f3';
-        $this->secret = '643efbd7f3cd6398df1e7adb441afceb';
+//        $this->appid = 'wx7b4d857deb0447f3';
+//        $this->secret = '643efbd7f3cd6398df1e7adb441afceb';
+
+        $this->appid = 'wx9082e5ac2fdb513f';
+        $this->secret = 'e334c41e1c4aa962f65d1882092fbda6';
     }
 
     public function getUserUnionid(){
@@ -46,8 +49,10 @@ class UserMp extends BaseController
         if(!$data['code'] || $data['code'] == '' || $data['code'] =='undefined') {
             return app('json')->fail("异常操作");
         }
-        $appid = 'wx7b4d857deb0447f3';
-        $secret = '643efbd7f3cd6398df1e7adb441afceb';
+//        $appid = 'wx7b4d857deb0447f3';
+//        $secret = '643efbd7f3cd6398df1e7adb441afceb';
+        $appid = 'wx9082e5ac2fdb513f';
+        $secret = 'e334c41e1c4aa962f65d1882092fbda6';
         $url = "https://api.weixin.qq.com/sns/jscode2session?appid=".$appid."&secret=".$secret."&js_code=".$data['code']."&grant_type=authorization_code";
         $get = curlGet($url);
         if(!$get){

app/controller/merchant/store/order/RefundOrder.php

@@ -120,6 +120,8 @@ class RefundOrder extends BaseController
             $data['status'] = $status;
             $this->repository->agree($id,$data,$this->request->adminId(),1);
 
+            // 取消 订单所发放的福利
+            $this->repository->cancelOrderBonus($id);
         }else{
             $fail_message = $this->request->param('fail_message','');
             if($status == -1 && empty($fail_message)){

app/controller/merchant/store/shipping/ShippingTemplate.php

@@ -47,7 +47,9 @@ class ShippingTemplate extends BaseController
      */
     public function getList()
     {
-        return app('json')->success($this->repository->getList($this->request->merId()));
+//        return app('json')->success($this->repository->getList($this->request->merId()));
+        // 目前只包邮
+        return app('json')->success($this->repository->getList(0));
     }
 
     /**

cc.txt

@@ -0,0 +1 @@
+12

route/admin.php

@@ -86,6 +86,12 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::delete('delete/:id', '/delete')->name('configSettingDelete');
             Route::post('upload_file/:field', '/upload')->name('configUpload');
         })->prefix('admin.system.config.Config');
+        //用户身份升级配置
+        Route::group('config/identity', function () {
+            Route::post('update/:id', '/update')->name('configIdentityUpdate');
+            Route::get('update/table/:id', '/updateTable')->name('configIdentityUpdateForm');
+            Route::get('lst', '/lst')->name('configIdentityLst');
+        })->prefix('admin.system.config.Identity');
 
         Route::group('config/others', function () {
             Route::get('lst', 'ConfigOthers/lst')->name('configOthersSettingLst');

route/api.php

@@ -1291,6 +1291,10 @@ Route::group('api/', function () {
     ->middleware(\app\common\middleware\AllowOriginMiddleware::class)
     ->middleware(\app\common\middleware\InstallMiddleware::class)
     ->middleware(\app\common\middleware\CheckSiteOpenMiddleware::class);
+//Route::get('/sxb_test', 'api.store.merchant.TaskPartnerProfits/partnerProfits');
+Route::get('sxb_test', function () {
+    return 'hello,ThinkPHP6!';
+});
 Route::any('/share', function () {
     return view(app()->getRootPath() . 'public/share/register.html');
 });