1

app/adminapi/controller/v1/product/StoreProductGiftGroup.php

@@ -68,4 +68,32 @@ class StoreProductGiftGroup extends AuthController
         $users = $this->services->getRecommendationUsers($product_id);
         return app('json')->success($users);
     }
+
+    /**
+     * 获取我的礼包商品列表（当前管理员）
+     * @return \think\Response
+     */
+    public function getMyGiftProductList()
+    {
+        $where = $this->request->getMore([
+            ['name', '']
+        ]);
+        $uid = $this->adminId; // 自动获取当前登录管理员的uid
+        $where['uid'] = $uid; // 添加uid过滤条件
+        return app('json')->success($this->services->getGiftProductList($where));
+    }
+
+    /**
+     * 获取我的推荐关系列表（当前管理员）
+     * @return \think\Response
+     */
+    public function getMyRecommendationRelationList()
+    {
+        $where = $this->request->getMore([
+            ['product_id', 0]
+        ]);
+        $uid = $this->adminId; // 自动获取当前登录管理员的uid
+        $where['uid'] = $uid;
+        return app('json')->success($this->services->getRecommendationRelationList($where));
+    }
 }

app/services/order/StoreOrderSuccessServices.php

@@ -139,6 +139,7 @@ class StoreOrderSuccessServices extends BaseServices
         }
 
         if ($orderInfo['is_lb'] == 1) {
+            self::giftQuota($orderInfo);
             @file_put_contents('quanju.txt', $orderInfo['lb_spread_uid'] . "-礼包推荐人2\r\n", 8);
             self::createGiftRecommendationRelationship($orderInfo); //建立礼包推荐关系
             self::giftRecommendationBonus($orderInfo); //礼包升级分红
@@ -182,7 +183,7 @@ class StoreOrderSuccessServices extends BaseServices
             $userGiftQuotaServices = app()->make(\app\services\user\UserGiftQuotaServices::class);
 
             // 更新用户额度字段
-            $userServices->bcInc($order['uid'], 'quota', $quotaAmount, 'uid');
+//            $userServices->bcInc($order['uid'], 'quota', $quotaAmount, 'uid');
 
             // 记录额度增加记录
             $balance = bcadd($userInfo['quota'] ?? 0, $quotaAmount, 2);
@@ -419,7 +420,7 @@ class StoreOrderSuccessServices extends BaseServices
             @file_put_contents('quanju4.txt', $directBrokerage . "-直推奖励\r\n", 8);
 
             // 扣除直推上级的额度
-            $userServices->bcInc($userRelation['pid'], 'quota', -$directBrokerage, 'uid');
+//            $userServices->bcInc($userRelation['pid'], 'quota', -$directBrokerage, 'uid');
             $quotaBalance = bcadd($pid_brokerage['quota'] ?? 0, -$directBrokerage, 2);
             $userGiftQuotaServices->income('use_direct_referral_quota', $userRelation['pid'], [
                 'nickname' => $userInfo['nickname'],
@@ -515,7 +516,7 @@ class StoreOrderSuccessServices extends BaseServices
                     @file_put_contents('quanju4.txt', '向上发放见点奖给真直推上级: uid=' . $splitTargetPid . ', 金额=' . $splitAmount . "\r\n", 8);
 
                     // 扣除真直推上级的额度
-                    $userServices->bcInc($splitTargetPid, 'quota', -$splitAmount, 'uid');
+//                    $userServices->bcInc($splitTargetPid, 'quota', -$splitAmount, 'uid');
                     $quotaBalance = bcadd($pidBrokerage['quota'] ?? 0, -$splitAmount, 2);
                     $userGiftQuotaServices->income('use_spot_quota', $splitTargetPid, [
                         'nickname' => $userInfo['nickname'],
@@ -537,7 +538,7 @@ class StoreOrderSuccessServices extends BaseServices
                     @file_put_contents('quanju4.txt', '向上发放见点奖给假直推上级: uid=' . $nextUid . ', 金额=' . $remainderAmount . "\r\n", 8);
 
                     // 扣除假直推上级的额度
-                    $userServices->bcInc($nextUid, 'quota', -$remainderAmount, 'uid');
+//                    $userServices->bcInc($nextUid, 'quota', -$remainderAmount, 'uid');
                     $quotaBalance = bcadd($currentBrokerage['quota'] ?? 0, -$remainderAmount, 2);
                     $userGiftQuotaServices->income('use_spot_quota', $nextUid, [
                         'nickname' => $userInfo['nickname'],
@@ -559,7 +560,7 @@ class StoreOrderSuccessServices extends BaseServices
                     @file_put_contents('quanju4.txt', '向上发放见点奖: uid=' . $nextUid . ', 金额=' . $spotBrokerage . "\r\n", 8);
 
                     // 扣除上级的额度
-                    $userServices->bcInc($nextUid, 'quota', -$spotBrokerage, 'uid');
+//                    $userServices->bcInc($nextUid, 'quota', -$spotBrokerage, 'uid');
                     $quotaBalance = bcadd($currentBrokerage['quota'] ?? 0, -$spotBrokerage, 2);
                     $userGiftQuotaServices->income('use_spot_quota', $nextUid, [
                         'nickname' => $userInfo['nickname'],
@@ -605,7 +606,7 @@ class StoreOrderSuccessServices extends BaseServices
                 @file_put_contents('quanju4.txt', '向下发放见点奖给直推下级: uid=' . $subordinate['uid'] . ', 金额=' . $spotBrokerage . "\r\n", 8);
 
                 // 扣除直推下级的额度
-                $userServices->bcInc($subordinate['uid'], 'quota', -$spotBrokerage, 'uid');
+//                $userServices->bcInc($subordinate['uid'], 'quota', -$spotBrokerage, 'uid');
                 $quotaBalance = bcadd($subBrokerage['quota'] ?? 0, -$spotBrokerage, 2);
                 $userGiftQuotaServices->income('use_spot_quota', $subordinate['uid'], [
                     'nickname' => $userInfo['nickname'],
@@ -655,7 +656,7 @@ class StoreOrderSuccessServices extends BaseServices
                             @file_put_contents('quanju4.txt', '向下发放见点奖给同组下级: uid=' . $member['uid'] . ', 金额=' . $spotBrokerage . "\r\n", 8);
 
                             // 扣除同组下级的额度
-                            $userServices->bcInc($member['uid'], 'quota', -$spotBrokerage, 'uid');
+//                            $userServices->bcInc($member['uid'], 'quota', -$spotBrokerage, 'uid');
                             $quotaBalance = bcadd($memberBrokerage['quota'] ?? 0, -$spotBrokerage, 2);
                             $userGiftQuotaServices->income('use_spot_quota', $member['uid'], [
                                 'nickname' => $userInfo['nickname'],

app/services/product/product/StoreProductGiftGroupService.php

@@ -104,8 +104,14 @@ class StoreProductGiftGroupService extends BaseServices
     {
         [$page, $limit] = $this->getPageValue();
 
+        // 检查是否传了uid，如果传了uid则只获取该用户的礼包商品
+        $daoWhere = [];
+        if (isset($where['uid']) && $where['uid']) {
+            $daoWhere['uid'] = $where['uid'];
+        }
+
         // 获取所有礼包商品
-        $giftGroups = $this->dao->getList([], 'DISTINCT product_id', 0, 0);
+        $giftGroups = $this->dao->getList($daoWhere, 'DISTINCT product_id', 0, 0);
 
         if (empty($giftGroups)) {
             return ['list' => [], 'count' => 0];