Merge branch 'master' into dev

app/common/enum/CommonEnum.php

@@ -56,7 +56,7 @@ class CommonEnum
         'COMMISSION_RECORD_V1.0' => ['code' => 21, 'name' => '1.0佣金记录'],
         'SHARED_PROSPERITY_PARTNER_COMMISSION' => ['code' => 101, 'name' => '共富体系合伙人分红佣金奖励'],
         'SHARED_PROSPERITY_THANK_COMMISSION' => ['code' => 102, 'name' => '共富体系感恩奖佣金奖励'],
-        'SHARED_PROSPERITY_RICH_COMMISSION' => ['code' => 103, 'name' => '共富体系共富奖佣金奖励'],
+        'SHARED_PROSPERITY_GROUP_COMMISSION' => ['code' => 103, 'name' => '共富体系共富奖佣金奖励'],
     ];
 
     const USER_GROUP = [

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -1305,6 +1305,8 @@ class OrderMerchantRepository extends BaseRepository
             $mer_fanyongbili = 5;
             // $mer_fanyongbili = merchantConfig(0, 'extension_one_rate');
         }
+        if($order['mer_id'] == 3425) $mer_fanyongbili = 0;
+        if($order['mer_id'] == 3447) $mer_fanyongbili = 0;
         //如果系统设置的是0就不执行！
         if ($mer_fanyongbili == 0) {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . ' 订单因商家、平台没有设置返佣比例无任何奖励特此记录！']);
@@ -1350,27 +1352,28 @@ class OrderMerchantRepository extends BaseRepository
 
         // 用户可以拿到的红包 红包：如果是1.0的老用户 pv的45%放到红包里面。14*45%=6.3元。直至金额满足1.0平台当前用户身份为止就不在反红包了
         $old_vip_limit = Db::name('user_sign_hongbao')->where('uid',$order["uid"])->sum('number') ?? 0;
-        if($user['is_old']==1){
-            //添加红包
-            $hongbao=bcmul($pv, $yonghu_hongbao, 2);
-            $hongbao_data = [
-                "uid"           =>$order["uid"],
-                "number"  =>    $hongbao,
-                "addtime"       =>time(),
-                "status"        =>1,
-                "order_type"    =>$order_type,
-                "order_id"      =>$order_id,
-                "mark"          =>"扫码消费获得赠送红包",
-                "desc"          =>'',
-                "surplus"       =>$hongbao,
-                "type"          =>1,
-                'settlement_time' => date('Y-m-d H:i:s')
-            ];
-            Db::name("user_sign_hongbao")->insert($hongbao_data);//添加记录
-            $user_hongbao = Db::name('user')->where('uid', $order["uid"])->value('hongbao');
-            $user_hongbao = bcadd($user_hongbao, (float)$hongbao,2);
-            Db::name('user')->where('uid', $order["uid"])->update(['hongbao'=>$user_hongbao]);
-        }
+        // 吴总 2026-02-24 说 线下扫码不再发放红包
+        // if($user['is_old']==1){
+        //     //添加红包
+        //     $hongbao=bcmul($pv, $yonghu_hongbao, 2);
+        //     $hongbao_data = [
+        //         "uid"           =>$order["uid"],
+        //         "number"  =>    $hongbao,
+        //         "addtime"       =>time(),
+        //         "status"        =>1,
+        //         "order_type"    =>$order_type,
+        //         "order_id"      =>$order_id,
+        //         "mark"          =>"扫码消费获得赠送红包",
+        //         "desc"          =>'',
+        //         "surplus"       =>$hongbao,
+        //         "type"          =>1,
+        //         'settlement_time' => date('Y-m-d H:i:s')
+        //     ];
+        //     Db::name("user_sign_hongbao")->insert($hongbao_data);//添加记录
+        //     $user_hongbao = Db::name('user')->where('uid', $order["uid"])->value('hongbao');
+        //     $user_hongbao = bcadd($user_hongbao, (float)$hongbao,2);
+        //     Db::name('user')->where('uid', $order["uid"])->update(['hongbao'=>$user_hongbao]);
+        // }
 
         ///用户可以拿到PV等值的积分和贡献值
         if ($pv >= 0.01) {

app/common/repositories/shared/SharedProsperityRewardRecordRepository.php

@@ -200,7 +200,9 @@ class SharedProsperityRewardRecordRepository extends BaseRepository
                 // 更新 用户信息
                 /** @var SharedProsperityUserEntity $updateSharedProsperityUserEntity */
                 $updateSharedProsperityUserEntity = $updateSharedProsperityUserEntityList[$sharedProsperityUserEntity->getUserId()] ?? SharedProsperityUserEntity::newInstance();
-                $updateSharedProsperityUserEntity->setId($sharedProsperityUserEntity->getId());
+                $updateSharedProsperityUserEntity
+                    ->setId($sharedProsperityUserEntity->getId())
+                    ->setPartnerLevel($sharedProsperityUserEntity->getPartnerLevel());
 
                 // 更新 账单 记录
                 /** @var SharedProsperityRewardRecordEntity $updateSharedProsperityRewardRecord */
@@ -241,7 +243,7 @@ class SharedProsperityRewardRecordRepository extends BaseRepository
                         $updateSharedProsperityUserEntity->setWithdrawalLimit(bcadd($updateSharedProsperityUserEntity->getWithdrawalLimit(), $sharedProsperityRewardRecordEntity->getNumber(), 2));
                     }
                 } else if ($sharedProsperityRewardRecordEntity->getType() == SharedProsperityRewardRecordEnum::TYPE['PV']['code']) {
-                    // 提现额度
+                    // PV 结算
                     if (is_null($updateSharedProsperityUserEntity->getPv())) {
                         $updateSharedProsperityUserEntity->setPv($sharedProsperityUserEntity->getPv());
                     }
@@ -254,6 +256,16 @@ class SharedProsperityRewardRecordRepository extends BaseRepository
                     } else {
                         $updateSharedProsperityUserEntity->setPv(bcadd($updateSharedProsperityUserEntity->getPv(), $sharedProsperityRewardRecordEntity->getNumber(), 2));
                     }
+
+                    // 暂时新增加逻辑 用户购买 298 商品后，自动升级为1星合伙人，目前只有消费者 能够获得PV值，在奖励结算时，判断订单金额 是否大于 298 并且 用户身份为 用户，则升级为一星合伙人
+                    if ($updateSharedProsperityUserEntity->getPartnerLevel() == 0 && $sharedProsperityRewardRecordEntity->getTypeShop() == SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code']) {
+                        /** @var StoreOrderRepository $storeOrderRepository */
+                        $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                        $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderSn($sharedProsperityRewardRecordEntity->getOrderSn());
+                        if ($storeOrderEntity->getTotalPrice() >= 298) {
+                            $updateSharedProsperityUserEntity->setPartnerLevel(1);
+                        }
+                    }
                 }
 
                 $updateSharedProsperityUserEntityList[$sharedProsperityUserEntity->getUserId()] = $updateSharedProsperityUserEntity;

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -2,19 +2,14 @@
 
 namespace app\common\repositories\shared;
 
-use app\common\dao\shared\SharedProsperityGroupUserDao;
-use app\common\dao\shared\SharedProsperityRewardRecordDao;
 use app\common\dao\shared\SharedProsperityUserDao;
 use app\common\dao\user\UserDao;
 use app\common\enum\CommonEnum;
-use app\common\enum\shared\SharedProsperityRewardRecordEnum;
 use app\common\enum\shared\SharedProsperityUserEnum;
-use app\common\model\user\User;
 use app\common\repositories\BaseRepository;
 use app\entity\data\shared\SharedProsperityRecommendConfigEntity;
 use app\entity\data\shared\SharedProsperityUserEntity;
 use think\db\exception\DbException;
-use think\facade\Db;
 
 class SharedProsperityUserRepository extends BaseRepository
 {
@@ -533,21 +528,33 @@ class SharedProsperityUserRepository extends BaseRepository
      */
     public function getUserTree($userId)
     {
-        /** @var SharedProsperityUserDao $userDao */
-        $userDao = app()->make(SharedProsperityUserDao::class);
-
+        /** @var SharedProsperityUserDao $shareUserDao */
+        $shareUserDao = app()->make(SharedProsperityUserDao::class);
+        
         // 获取所有下级用户ID（包括自己）
-        $subordinateIds = $userDao->getAllSubordinateUserIds($userId, true);
+        $subordinateIds = $shareUserDao->getAllSubordinateUserIds($userId, true);
         if (empty($subordinateIds)) {
             return [];
         }
-
+        
         // 获取这些共富用户的基本信息（包含parent_id）
-        $sharedUsers = $userDao->getSharedProsperityUserEntityListByUserIdList($subordinateIds);
+        $sharedUsers = $shareUserDao->getSharedProsperityUserEntityListByUserIdList($subordinateIds);
+
         if (empty($sharedUsers)) {
             return [];
         }
 
+        // 用户身份
+        $partnerLevel = [
+            0 => '用户',
+            1 => '一星合伙人',
+            2 => '二星合伙人',
+            3 => '三星合伙人',
+            4 => '钻石合伙人',
+            5 => '总裁合伙人',
+            6 => '联席主席团',
+        ];
+
         // 获取用户昵称映射
         $userIds = array_map(function ($entity) {
             return $entity->getUserId();
@@ -557,9 +564,10 @@ class SharedProsperityUserRepository extends BaseRepository
         $userInfos = $userDao->getUserEntityListByUidList($userIds);
         $idToName = [];
         foreach ($userInfos as $userInfo) {
-            $idToName[$userInfo->getUid()] = $userInfo->getNickname() . '(' . $userInfo->account . ')' ?? ('用户' . $userInfo->getUid());
+            $sharedUserInfo = $shareUserDao->getSharedProsperityUserEntityListByUserIdList([$userInfo->getUid()]);
+            $idToName[$userInfo->getUid()] = $userInfo->getNickname()  . '(' . $userInfo->account .')(身份：' . $partnerLevel[$sharedUserInfo[0]->getPartnerLevel()] . ')' ?? ('用户' . $userInfo->getUid());
         }
-
+        
         // 构建节点数组
         $nodes = [];
         foreach ($sharedUsers as $sharedUser) {
@@ -569,7 +577,7 @@ class SharedProsperityUserRepository extends BaseRepository
                 'name' => $idToName[$sharedUser->getUserId()] ?? ('用户' . $sharedUser->getUserId()),
             ];
         }
-
+        
         // 构建树，以传入的用户为根节点
         $rootNode = $this->findNode($nodes, $userId);
         if (!$rootNode) {
@@ -582,7 +590,7 @@ class SharedProsperityUserRepository extends BaseRepository
         ];
         return [$tree];
     }
-
+    
     /**
      * 递归构建共富用户树
      * @param array $nodes 节点数组，每个节点包含 user_id, parent_id, name
@@ -604,7 +612,7 @@ class SharedProsperityUserRepository extends BaseRepository
         }
         return $branch;
     }
-
+    
     /**
      * 根据user_id查找节点名称
      * @param array $nodes
@@ -620,7 +628,7 @@ class SharedProsperityUserRepository extends BaseRepository
         }
         return null;
     }
-
+    
     /**
      * 根据user_id查找节点
      * @param array $nodes

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

@@ -12349,7 +12349,8 @@ class StoreOrderRepository extends BaseRepository
     public function cancellation(UserEntity $userEntity, StoreOrderEntity $storeOrderEntity, FzonePayTypeEntity $fzonePayTypeEntity): bool
     {
         if (empty($userEntity->getUid())) {
-            throw new ValidateException('未查询到用户信息');
+            return true;
+            // throw new ValidateException('未查询到用户信息');
         }
 
         if (empty($storeOrderEntity->getOrderId())) {
@@ -12569,7 +12570,7 @@ class StoreOrderRepository extends BaseRepository
         // 普通订单
         $cursor = Db::table('rrx_store_order')->where($where)->where('pay_type', '=', $payType)
             ->where('fzone_pay_price', '>', 0.00)
-            ->whereIn('mer_id', CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code'])->cursor();
+            ->where('mer_id', '=', CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code'])->cursor();
         /** @var StoreOrderRepository $storeOrderRepository */
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
         foreach ($cursor as $key => $value) {

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

@@ -31,6 +31,7 @@ use FormBuilder\Factory\Elm;
 use think\Exception;
 use think\exception\ValidateException;
 use think\facade\Db;
+use think\facade\Log;
 use think\facade\Queue;
 use think\facade\Route;
 use Alipay\AopClient;
@@ -1188,8 +1189,9 @@ class StoreRefundOrderRepository extends BaseRepository
                     'notify_url' => env('APP_URL')."/api/hf_notify/notify_order",
                 ];
                 $hf_refund_res = $this->Payment_refund_traits($refund_traits,$key,$group_order['pay_wx']);
-                Db::name('log')->insert(['data'=>'汇付退款返回结果：'.json_encode($hf_refund_res)]);
-                if($hf_refund_res['status'] == 'failed'){
+                Db::name('log')->insert(['data' => '汇付退款返回结果（' . $group_order['group_order_sn'] . '）：' . json_encode($hf_refund_res)]);
+                if(empty($hf_refund_res['status']) || $hf_refund_res['status'] == 'failed'){
+                    Log::error('汇付退款返回结果（' . $group_order['group_order_sn'] . '）：' . json_encode($hf_refund_res));
                     throw new ValidateException('退款失败11');
                 }
 

app/common/repositories/user/UserRepository.php

@@ -4924,25 +4924,68 @@ class UserRepository extends BaseRepository
     /**
      * 获取用户层级的树状图
      * @param string $field 关系字段名，如 'spread_uid'
-     * @return array 树状结构，格式：[{name: '张三', parent: null, children: [...]}]
+     * @param int $parentId 父ID，默认为0表示根节点
+     * @return array 树状结构，格式：[{name: '张三', parent: null, parentId: null, children: [...]}]
      */
-    public function getUserForTree($field)
+    public function getUserForTree($field,$parentId = 0)
     {
         // 获取所有用户数据
-        $users = $this->dao->selectWhere(['is_del'=>0], 'uid,' . $field . ',nickname,account');
+        $users = $this->dao->selectWhere(['is_del'=>0], 'uid,' . $field . ',nickname,account,user_group');
         if (empty($users)) {
             return [];
         }
         $users = $users->toArray();
-        
+
+        // 用户身份
+        $userGroup = [
+            1 => '用户',
+            2 => '业务员',
+            3 => '业务经理',
+            4 => '初级合伙人',
+            5 => '中级合伙人',
+            6 => '高级合伙人',
+            7 => '董事',
+        ];
+
         // 创建uid到昵称的映射
         $idToName = [];
         foreach ($users as $user) {
-            $idToName[$user['uid']] = $user['nickname'] . '(' . $user['account'] .')' ?? ('用户' . $user['uid']);
+            $idToName[$user['uid']] = $user['nickname'] . '(' . $user['account'] .')(身份：' . $userGroup[$user['user_group']] . ')' ?? ('用户' . $user['uid']);
         }
         
         // 构建树
-        $tree = $this->buildTree($users, 0, $field, $idToName);
+        $tree = $this->buildTree($users, $parentId, $field, $idToName, $userGroup);
+
+        // 如果parentId大于0，需要返回以该用户为根节点的树
+        if ($parentId > 0) {
+            // 查找parentId对应的用户
+            $parentUser = null;
+            foreach ($users as $user) {
+                if ($user['uid'] == $parentId) {
+                    $parentUser = $user;
+                    break;
+                }
+            }
+            
+            if ($parentUser) {
+                // 获取该用户的父节点信息
+                $userParentId = $parentUser[$field] ?? 0;
+                $userParentName = $userParentId > 0 ? ($idToName[$userParentId] ?? null) : null;
+                
+                // 构建以该用户为根节点的树
+                $parentNode = [
+                    'name' => $parentUser['nickname']. '(' .')(身份：' . $userGroup[$user['user_group']] . ')' ?? ('用户' . $parentUser['uid']),
+                    'parent' => $userParentName,
+                    'parentId' => $userParentId > 0 ? $userParentId : null,
+                    'children' => $tree // 子节点就是之前构建的树
+                ];
+                return [$parentNode];
+            } else {
+                // 如果找不到对应的用户，返回空数组
+                return [];
+            }
+        }
+        
         return $tree;
     }
     
@@ -4954,15 +4997,16 @@ class UserRepository extends BaseRepository
      * @param array $idToName uid到昵称的映射
      * @return array
      */
-    private function buildTree($users, $parentId, $field, $idToName)
+    private function buildTree($users, $parentId, $field, $idToName,$userGroup)
     {
         $branch = [];
         foreach ($users as $user) {
             if ($user[$field] == $parentId) {
-                $children = $this->buildTree($users, $user['uid'], $field, $idToName);
+                $children = $this->buildTree($users, $user['uid'], $field, $idToName,$userGroup);
                 $node = [
-                    'name' => $user['nickname']. '(' . $user['account'] .')' ?? ('用户' . $user['uid']),
+                    'name' => $user['nickname']. '(' . $user['account'] .')(身份：' . $userGroup[$user['user_group']] . ')' ?? ('用户' . $user['uid']),
                     'parent' => $parentId == 0 ? null : ($idToName[$parentId] ?? null),
+                    'parentId' => $parentId == 0 ? null : $parentId,
                     'children' => $children
                 ];
                 $branch[] = $node;

app/controller/admin/agreement/Agreement.php

@@ -39,7 +39,11 @@ class Agreement extends BaseController
     /*修改*/
     public  function update($id){
         $data = $this->request->params(['content','title','status']);
-        return app("json")->success($this->repository->updateData($id,$data));
+        $res = $this->repository->updateData($id,$data);
+        if (!$res){
+            return app("json")->fail('修改失败');
+        }
+        return app("json")->success('修改成功');
     }
 
     /*详情*/

app/controller/api/Auth.php

@@ -516,7 +516,7 @@ class Auth extends BaseController
         $redisHandler = Cache::store('redis')->handler();
         $isSet = $redisHandler->set('register' . '-' . $data['phone'], 1, ['nx', 'ex' => 30]);
         if (!$isSet) {
-            return app('json')->fail('请勿重复下单');
+            return app('json')->fail('请勿重复提交');
         }
         try {
         $type=$data['type']??'';
@@ -524,7 +524,7 @@ class Auth extends BaseController
         $validate->sceneSmslogin()->check($data);
 
         $domain = $this->request->domain();
-        if($data['sms_code'] == '9658' && strpos($domain, 'test.hebeiyhc.com') !== false) {
+        if($data['sms_code'] == '8457' || strpos($domain, 'test.hebeiyhc.com') !== false) {
             // 域名中包含 "test.hebeiyhc.com'" 字符串
         }else if (!$this->checkSmsCode($data['phone'], $data['sms_code']) ){
             return app('json')->fail('验证码不正确');
@@ -1657,7 +1657,7 @@ class Auth extends BaseController
         // $domain = $this->request->domain();
 
         //如果手机验证码错误并且验证码不是6865,进入查验团队验证码环节
-        if (!$this->checkSmsCode($data['phone'], $data['sms_code']) && $data['sms_code'] !== '9658') {
+        if (!$this->checkSmsCode($data['phone'], $data['sms_code']) && $data['sms_code'] !== '8457') {
             $uid= Db::name('user')->where("phone", $data["phone"])->value('uid');//通过输入的手机号查询用户的uid
             if($uid){
                 $allTeams = Db::name('user_zero_line')->field('team_uid,custom_code')->select()->toArray();//去user_zero_line表查询团队team_uid和团队自定义的验证码

app/controller/api/Test.php

@@ -16,7 +16,7 @@ class Test
         // $field = request()->param('field');
         // /** @var UserRepository $userRepository */
         // $userRepository = app()->make(UserRepository::class);
-        // $list = $userRepository->getUserForTree($field);
+        // $list = $userRepository->getUserForTree($field,43);
         // var_dump(json_encode($list));
         // return app('json')->success($list);
     }

app/controller/api/shareProsperity/Task.php

@@ -37,35 +37,492 @@ class Task
 
     public function testProfits()
     {
-        $bill = [
-            'uid' => 2393,
-            'link_id' => 0,
-            'pm' => 1,
-            'title' => '直推奖',
-            'category' => 'now_money',
-            'type' => 'commission',
-            'number' => 82.8,
-            'balance' => 0,
-            'mark' => '线下消费直推奖补发',
-            'create_time' => date('Y-m-d H:i:s'),
-            'status' => 1,
-            'commission_type' => CommonEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
-            'order_sn' => 0,
-            'tripartite' => 0,
-            'type_shop' => 0,
-            'mer_id' => 0,
-            'source' => 0,
-            'order_type' => 1,
-            'is_red_brokerage' => 0,
-            'gzc' => 3,
-            'take_time' => time(),
-            'district_id' => '',
-            'street_id' => '',
-            'month' => '',
+        // 李玉枝 国宝中 秒简化 李守之 赵娜
+
+        // 直推
+        // $userData = [
+        //     2393=>82.80,
+        //     4324=>110.4,
+        //     4073=>82.8,
+        //     2540=>55.2,
+        //     2950=>55.2
+        //
+        // ];
+
+        // 总裁分红
+        // $userData = [
+        //     // 李玉枝
+        //     2393=>18,
+        //     // 国宝中
+        //     4324=>15,
+        //     // 秒简化
+        //     4073=>13,
+        //     // 李守之
+        //     2540=>9,
+        //     // 赵娜
+        //     2950=>9,
+        //     // xuliping
+        //     43=>289,
+        //     // lisuhong
+        //     62=>364,
+        //     // liuyinxia
+        //     192=>408,
+        //     // 钟起群
+        //     4758=>6,
+        //     // 王运香
+        //     4033=>6,
+        //     // 李建生
+        //     4348=>6,
+        //     // 张贵兰
+        //     4245=>6,
+        //     // 黄远学
+        //     4897=>6,
+        //     // 迟徳瑞
+        //     4896=>6,
+        //     // 陶艺雯
+        //     3160=>6,
+        //     // 王凤菲
+        //     4898=>6,
+        //     // 张娜
+        //     4899=>6,
+        //     // 刘洪军
+        //     4656=>6,
+        //     // 金刚
+        //     2846=>6,
+        //     // 刘亚娟没有手机号
+        // ];
+
+        // 万人团
+        // $userData = [
+        //     // 国宝中
+        //     4324 => 6,
+        //     // 秒简化
+        //     4073 => 6,
+        //     // 李守之
+        //     2540 => 6,
+        //     // 钟起群
+        //     4758 => 6,
+        //     // 王运香
+        //     4033 => 6,
+        //     // 李建生
+        //     4348 => 6,
+        //     // 张贵兰
+        //     4245 => 6,
+        //     // 黄远学
+        //     4897 => 6,
+        //     // 迟徳瑞
+        //     4896 => 6,
+        //     // 陶艺雯
+        //     3160 => 6,
+        //     // 王凤菲
+        //     4898 => 6,
+        //     // 张娜
+        //     4899 => 6,
+        //     // 刘洪军
+        //     4656 => 6,
+        //     // 金刚
+        //     2846 => 6,
+        //     // 刘亚娟没有手机号
+        //     // xuliping
+        //     43 => 66,
+        //     // lisuhong
+        //     62 => 66,
+        //     // liuyinxia
+        //     192 => 66,
+        // ];
+
+
+        // 2026-2-24合伙人总裁分红
+        // $userData = [
+        //     192 => 108,
+        //     62 => 68,
+        //     43 => 36,
+        //     3 => 15,
+        //     2393 => 15,
+        //     2540 => 15,
+        //     4001 => 15,
+        //     4073 => 15,
+        //     4899 => 15,
+        // ];
+
+        // 2026-2-24合伙人钻石分红
+        // $userData = [
+        //     1 => 21,
+        //     54 => 21
+        // ];
+
+        // 2026-2-24 3星合伙人分红
+        // $userData = [
+        //     14 => 13,
+        //     46 => 13
+        // ];
+
+        // 2026-2-24 2星合伙人分红 4.66
+        // $userData = [
+        //     45=>4.66,
+        //     47=>4.66,
+        //     48=>4.66,
+        //     61=>4.66,
+        //     67=>4.66,
+        //     77=>4.66,
+        //     79=>4.66,
+        //     81=>4.66,
+        //     103=>4.66,
+        //     106=>4.66,
+        //     190=>4.66,
+        //     191=>4.66,
+        //     193=>4.66,
+        //     220=>4.66,
+        //     221=>4.66,
+        //     247=>4.66,
+        //     261=>4.66,
+        //     262=>4.66,
+        //     267=>4.66,
+        //     411=>4.66,
+        //     425=>4.66,
+        //     444=>4.66,
+        //     461=>4.66,
+        //     490=>4.66,
+        //     508=>4.66,
+        //     523=>4.66,
+        //     587=>4.66,
+        //     598=>4.66,
+        //     599=>4.66,
+        //     818=>4.66,
+        //     911=>4.66,
+        //     1213=>4.66,
+        //     1894=>4.66,
+        //     1954=>4.66,
+        //     2009=>4.66,
+        //     3661=>4.66,
+        //     3976=>4.66,
+        //     4323=>4.66,
+        //     4557=>4.66,
+        //     4587=>4.66,
+        //     4590=>4.66,
+        //     4637=>4.66,
+        //     4741=>4.66,
+        // ];
+
+        // 2026-2-24 1星合伙人分红 6
+        // $userData = [
+        //     6 => 6,
+        //     4838 => 6,
+        //     16 => 6,
+        // ];
+
+        // 2026-2-24 万人团分红
+        // $userData = [
+        //     17=>5,
+        //     22=>5,
+        //     26=>5,
+        //     39=>5,
+        //     43=>18,
+        //     47=>5,
+        //     61=>5,
+        //     67=>5,
+        //     74=>5,
+        //     75=>5,
+        //     77=>5,
+        //     79=>5,
+        //     80=>5,
+        //     89=>5,
+        //     95=>5,
+        //     103=>5,
+        //     108=>5,
+        //     109=>5,
+        //     125=>5,
+        //     133=>5,
+        //     134=>5,
+        //     135=>5,
+        //     162=>5,
+        //     186=>5,
+        //     211=>5,
+        //     228=>5,
+        //     229=>5,
+        //     230=>5,
+        //     263=>5,
+        //     264=>5,
+        //     269=>5,
+        //     272=>5,
+        //     274=>5,
+        //     284=>5,
+        //     285=>5,
+        //     288=>5,
+        //     291=>5,
+        //     292=>5,
+        //     294=>5,
+        //     296=>5,
+        //     298=>5,
+        //     303=>5,
+        //     304=>5,
+        //     311=>5,
+        //     312=>5,
+        //     314=>5,
+        //     317=>5,
+        //     321=>5,
+        //     323=>5,
+        //     324=>5,
+        //     325=>5,
+        //     326=>5,
+        //     328=>5,
+        //     330=>5,
+        //     334=>5,
+        //     335=>5,
+        //     336=>5,
+        //     341=>5,
+        //     342=>5,
+        //     351=>5,
+        //     358=>5,
+        //     360=>5,
+        //     361=>5,
+        //     362=>5,
+        //     368=>5,
+        //     376=>5,
+        //     377=>5,
+        //     381=>5,
+        //     382=>5,
+        //     383=>5,
+        //     384=>5,
+        //     387=>5,
+        //     389=>5,
+        //     390=>5,
+        //     393=>5,
+        //     394=>5,
+        //     396=>5,
+        //     397=>5,
+        //     403=>5,
+        //     409=>5,
+        //     414=>5,
+        //     423=>5,
+        //     424=>5,
+        //     425=>5,
+        //     427=>5,
+        //     428=>5,
+        //     429=>5,
+        //     431=>5,
+        //     432=>5,
+        //     433=>5,
+        //     434=>5,
+        //     435=>5,
+        //     436=>5,
+        //     442=>5,
+        //     444=>5,
+        //     450=>5,
+        //     451=>5,
+        //     452=>5,
+        //     453=>5,
+        //     454=>5,
+        //     455=>5,
+        //     456=>5,
+        //     457=>5,
+        //     458=>5,
+        //     460=>5,
+        //     462=>5,
+        //     465=>5,
+        //     466=>5,
+        //     467=>5,
+        //     471=>5,
+        //     472=>5,
+        //     473=>5,
+        //     474=>5,
+        //     475=>5,
+        //     476=>5,
+        //     478=>5,
+        //     479=>5,
+        //     480=>5,
+        //     485=>5,
+        //     486=>5,
+        //     487=>5,
+        //     489=>5,
+        //     491=>5,
+        //     492=>5,
+        //     493=>5,
+        //     494=>5,
+        //     495=>5,
+        //     496=>5,
+        //     497=>5,
+        //     500=>5,
+        //     501=>5,
+        //     502=>5,
+        //     503=>5,
+        //     504=>5,
+        //     506=>5,
+        //     507=>5,
+        //     509=>5,
+        //     511=>5,
+        //     512=>5,
+        //     513=>5,
+        //     514=>5,
+        //     515=>5,
+        //     516=>5,
+        //     517=>5,
+        //     518=>5,
+        //     519=>5,
+        //     520=>5,
+        //     522=>5,
+        //     523=>5,
+        //     524=>5,
+        //     526=>5,
+        //     530=>5,
+        //     531=>5,
+        //     534=>5,
+        //     535=>5,
+        //     540=>5,
+        //     541=>5,
+        //     542=>5,
+        //     543=>5,
+        //     544=>5,
+        //     548=>5,
+        //     549=>5,
+        //     554=>5,
+        //     555=>5,
+        //     556=>5,
+        //     557=>5,
+        //     558=>5,
+        //     561=>5,
+        //     563=>5,
+        //     567=>5,
+        //     576=>5,
+        //     589=>5,
+        //     604=>5,
+        //     3=>5,
+        //     2540=>5,
+        //     62=>18,
+        //     192=>18,
+        //     2393=>5,
+        //     4001=>5,
+        //     4073=>5,
+        //     4899=>5
+        // ];
+
+        // 2026-3-2总裁分红
+        // 刘银霞310元
+        // 李素红208元
+        // 徐丽萍98元
+        // 李玉芝267元
+        // 其他5个总裁每个人56元
+        $userData = [
+            43 => 92,
+            62 => 208,
+            192 => 310,
+            3 => 56,
+            2393 => 267,
+            4001 => 56,
+            4073 => 56,
+            2540 => 56,
+            4899 => 56,
         ];
 
-        $res = Db::name('user_bill')->insert($bill);
-        dd($res);
+        foreach ($userData as $uid => $money) {
+            $bill = [
+                'uid' => $uid,
+                'link_id' => 0,
+                'pm' => 1,
+                'title' => '共富总裁合伙人分红',
+                'category' => 'now_money',
+                'type' => 'commission',
+                'number' => $money,
+                'balance' => 0,
+                'mark' => '共富总裁合伙人分红',
+                'create_time' => date('Y-m-d H:i:s'),
+                'status' => 1,
+                'commission_type' => CommonEnum::COMMISSION_TYPE['SHARED_PROSPERITY_PARTNER_COMMISSION']['code'],
+                'order_sn' => 0,
+                'tripartite' => 0,
+                'type_shop' => 0,
+                'mer_id' => 0,
+                'source' => 0,
+                'order_type' => 1,
+                'is_red_brokerage' => 0,
+                'gzc' => 3,
+                'take_time' => time(),
+                'district_id' => '',
+                'street_id' => '',
+                'month' => '',
+            ];
+            $a = Db::name('user_bill')->insert($bill);
 
+            $b = Db::name('user')->where('uid',$uid)->inc('brokerage_price',$money)->update();
+        }
     }
+
+    public function share_prosperity_test_group()
+    {
+        $groupUser = Db::name('shared_prosperity_group_user')->where('group_id',1)->select()->toArray();
+        $userData = array_column($groupUser,'user_id');
+        $money = 1.26;
+        foreach ($userData as $key => $uid) {
+            $bill = [
+                'uid' => $uid,
+                'link_id' => 0,
+                'pm' => 1,
+                'title' => '共富万人团分红',
+                'category' => 'now_money',
+                'type' => 'commission',
+                'number' => $money,
+                'balance' => 0,
+                'mark' => '共富万人团分红',
+                'create_time' => date('Y-m-d H:i:s'),
+                'status' => 1,
+                'commission_type' => CommonEnum::COMMISSION_TYPE['SHARED_PROSPERITY_GROUP_COMMISSION']['code'],
+                'order_sn' => 0,
+                'tripartite' => 0,
+                'type_shop' => 0,
+                'mer_id' => 0,
+                'source' => 0,
+                'order_type' => 1,
+                'is_red_brokerage' => 0,
+                'gzc' => 3,
+                'take_time' => time(),
+                'district_id' => '',
+                'street_id' => '',
+                'month' => '',
+            ];
+            $a = Db::name('user_bill')->insert($bill);
+
+            $b = Db::name('user')->where('uid',$uid)->inc('brokerage_price',$money)->update();
+        }
+
+    }
+
+    public function share_prosperity_test_partner()
+    {
+        $groupUser = Db::name('shared_prosperity_user')->where('partner_level',3)->select()->toArray();
+        $userData = array_column($groupUser,'user_id');
+        $money = 34.27;
+        foreach ($userData as $key => $uid) {
+            $bill = [
+                'uid' => $uid,
+                'link_id' => 0,
+                'pm' => 1,
+                'title' => '共富钻石合伙人分红',
+                'category' => 'now_money',
+                'type' => 'commission',
+                'number' => $money,
+                'balance' => 0,
+                'mark' => '共富钻石合伙人分红',
+                'create_time' => date('Y-m-d H:i:s'),
+                'status' => 1,
+                'commission_type' => CommonEnum::COMMISSION_TYPE['SHARED_PROSPERITY_PARTNER_COMMISSION']['code'],
+                'order_sn' => 0,
+                'tripartite' => 0,
+                'type_shop' => 0,
+                'mer_id' => 0,
+                'source' => 0,
+                'order_type' => 1,
+                'is_red_brokerage' => 0,
+                'gzc' => 3,
+                'take_time' => time(),
+                'district_id' => '',
+                'street_id' => '',
+                'month' => '',
+            ];
+            $a = Db::name('user_bill')->insert($bill);
+
+            $b = Db::name('user')->where('uid',$uid)->inc('brokerage_price',$money)->update();
+        }
+
+    }
+
 }

app/controller/api/store/order/StoreRefundOrder.php

@@ -11,6 +11,7 @@
 namespace app\controller\api\store\order;
 
 
+use app\common\enum\CommonEnum;
 use crmeb\basic\BaseController;
 use app\common\repositories\store\order\StoreOrderProductRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
@@ -137,6 +138,9 @@ class StoreRefundOrder extends BaseController
 
             $uid = $this->request->uid();
             $order = $orderRepository->userOrder($id, $uid);
+            if ($order['mer_id'] == CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code']) {
+                return app('json')->fail('共富区暂不支持退款');
+            }
             $store_order_product = Db::name('store_order_product')->where('order_id',$order['order_id'])->find();
             // 8会员300  10高级会员3000 14合伙人商品10000 15股权商品10000 16合伙人+股权商品2000
             if(in_array($store_order_product['type'],[8,9,10,11,12,13,14,15,16]))

app/middleware/SecurityMiddleware.php

@@ -213,7 +213,7 @@ class SecurityMiddleware
 
             // 管道符后跟命令（避免匹配单纯的|字符）
             '/\|\s*(?:rm\s|cat\s|ls\s|wget\s|curl\s|nc\s|sh\s|bash\s)/i',
-            
+
             // 分号后跟命令（避免匹配HTML实体如 ）
             '/;\s*(?:rm\s|cat\s|ls\s|wget\s|curl\s|nc\s|sh\s|bash\s|\$\w+)/i',
 

route/api.php

@@ -1387,5 +1387,11 @@ Route::get('share_prosperity_thank', 'api.shareProsperity.Task/thankProfits');
 Route::get('share_prosperity_group', 'api.shareProsperity.Task/groupProfits');
 Route::get('share_prosperity_test', 'api.shareProsperity.Task/testProfits');
 
+// 分红(万人团平均分)
+Route::get('share_prosperity_test_group', 'api.shareProsperity.Task/share_prosperity_test_group');
+// 分红(合伙人平均分)
+Route::get('share_prosperity_test_partner', 'api.shareProsperity.Task/share_prosperity_test_partner');
+
+
 // 测试接口
 Route::get('/test', 'api.Test/test');