Merge branch 'dev-sc-260204' into dev

app/command/DeleteApiLog.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace app\command;
+
+use app\common\model\shared\SharedProsperityPartnerConsumeUpdateLog;
+use app\common\repositories\shared\SharedProsperityRecommendConfigRepository;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\facade\Db;
+
+class DeleteApiLog extends Command
+{
+    // 上级
+    const DAY = 7;
+
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('deleteApiLog')
+            ->setDescription('定时删除api日志');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $output->writeln('定时任务执行中...');
+
+        $this->delete();
+
+        $output->writeln('定时任务执行完成');
+    }
+
+    private function delete()
+    {
+        $time = time() - self::DAY * 24 * 60 * 60;
+        $time = date('Y-m-d', $time);
+        Db::name('api_request_log')->where('create_time', '<', $time)->limit(1000)->delete();
+    }
+
+}

app/common/dao/shared/SharedProsperityUserDao.php

@@ -161,9 +161,9 @@ class SharedProsperityUserDao extends BaseDao
      * @param int $userId
      * @return float
      */
-    public function getTeamPvSum(int $userId, int $hierarchy = CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Hierarchy']['code']): float
+    public function getTeamPvSum(int $userId, int $hierarchy = CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Hierarchy']['code'], $includeSelf = false): float
     {
-        $userIds = $this->getAllSubordinateUserIds($userId, false, $hierarchy);
+        $userIds = $this->getAllSubordinateUserIds($userId, $includeSelf, $hierarchy);
         if (empty($userIds)) {
             return 0.0;
         }

app/common/dao/shared/SharedProsperityUserParentLogDao.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\common\dao\shared;
+
+use app\common\dao\BaseDao;
+use app\common\model\shared\SharedProsperityUserParentLog;
+
+class SharedProsperityUserParentLogDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return SharedProsperityUserParentLog::class;
+    }
+}

app/common/dao/store/order/StoreOrderDao.php

@@ -733,7 +733,7 @@ class StoreOrderDao extends BaseDao
             /** @var StoreOrder $model */
             $model = $this->getModel();
             $dataRes = $model::getDB()
-                ->whereIn('card_id', $cartIdList)
+                ->whereIn('cart_id', $cartIdList)
                 ->where('paid', '=', StoreOrderEnum::PAID['YES']['code'])
                 ->select()
                 ->toArray();

app/common/model/shared/SharedProsperityUserParentLog.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\common\model\shared;
+
+use app\common\model\BaseModel;
+
+class SharedProsperityUserParentLog extends BaseModel
+{
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'shared_prosperity_user_parent_log';
+    }
+}

app/common/repositories/finance/FinanceRepository.php

@@ -491,17 +491,28 @@ class FinanceRepository extends BaseRepository
         $dayWhere .= " and DATE(create_time) = '" . $todayFormatted . "'";
         $sharedUserCount = Db::name('shared_prosperity_user')->count(); //共富会员总人数
         $sharedUserDayCount = Db::name('shared_prosperity_user')->where($dayWhere)->count(); //共富今日新增会员
-        $sharedUserPvCount = Db::name('shared_prosperity_reward_record')->where(['type'=>SharedProsperityRewardRecordEnum::TYPE['PV']['code']])->sum('number'); // 共富会员专区总业绩
-        $sharedUserLastWeekPv = Db::name('shared_prosperity_reward_record')->where($sWeekWhere)->where(['type'=>SharedProsperityRewardRecordEnum::TYPE['PV']['code']])->sum('number'); // 共富会员专区上周总业绩
-        $sharedUserWeekPv = Db::name('shared_prosperity_reward_record')->where($weekWhere)->where(['type'=>SharedProsperityRewardRecordEnum::TYPE['PV']['code']])->sum('number'); // 共富会员专区本周总业绩
-        $sharedUserTodayPv = Db::name('shared_prosperity_reward_record')->where($dayWhere)->where(['type'=>SharedProsperityRewardRecordEnum::TYPE['PV']['code']])->sum('number'); // 共富会员专区今日总业绩
+        $sharedUserPvCount = Db::name('shared_prosperity_reward_record')
+            ->where(['type' => SharedProsperityRewardRecordEnum::TYPE['PV']['code'], 'status' => SharedProsperityRewardRecordEnum::STATUS['VALID']['code'], 'pm' => SharedProsperityRewardRecordEnum::PM['INCOME']['code']])
+            ->sum('number'); // 共富会员专区总业绩
+        $sharedUserLastWeekPv = Db::name('shared_prosperity_reward_record')
+            ->where($sWeekWhere)
+            ->where(['type' => SharedProsperityRewardRecordEnum::TYPE['PV']['code'], 'status' => SharedProsperityRewardRecordEnum::STATUS['VALID']['code'], 'pm' => SharedProsperityRewardRecordEnum::PM['INCOME']['code']])
+            ->sum('number'); // 共富会员专区上周总业绩
+        $sharedUserWeekPv = Db::name('shared_prosperity_reward_record')
+            ->where($weekWhere)
+            ->where(['type' => SharedProsperityRewardRecordEnum::TYPE['PV']['code'], 'status' => SharedProsperityRewardRecordEnum::STATUS['VALID']['code'], 'pm' => SharedProsperityRewardRecordEnum::PM['INCOME']['code']])
+            ->sum('number'); // 共富会员专区本周总业绩
+        $sharedUserTodayPv = Db::name('shared_prosperity_reward_record')
+            ->where($dayWhere)
+            ->where(['type' => SharedProsperityRewardRecordEnum::TYPE['PV']['code'], 'status' => SharedProsperityRewardRecordEnum::STATUS['VALID']['code'], 'pm' => SharedProsperityRewardRecordEnum::PM['INCOME']['code']])
+            ->sum('number'); // 共富会员专区今日总业绩
 
         $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserCount, 'name' => '共富会员总人数'];
         $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserDayCount, 'name' => '共富今日新增会员'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserPvCount, 'name' => '共富会员专区总业绩'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserLastWeekPv, 'name' => '共富会员专区上周总业绩'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserWeekPv, 'name' => '共富会员专区本周总业绩'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserTodayPv, 'name' => '共富会员专区今日总业绩'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserPvCount, 'name' => '共富专区总业绩'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserLastWeekPv, 'name' => '共富专区上周总业绩'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserWeekPv, 'name' => '共富专区本周总业绩'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserTodayPv, 'name' => '共富专区今日总业绩'];
 
         $res['left'][] = $data;
         return $res;

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -6,6 +6,7 @@ use app\common\dao\shared\SharedProsperityGroupUserDao;
 use app\common\dao\shared\SharedProsperityRewardRecordDao;
 use app\common\dao\shared\SharedProsperityUserDao;
 use app\common\dao\shared\SharedProsperityUserLevelLogDao;
+use app\common\dao\shared\SharedProsperityUserParentLogDao;
 use app\common\dao\user\UserDao;
 use app\common\dao\user\UserWithdrawalLimitRecordDao;
 use app\common\enum\CommonEnum;
@@ -233,7 +234,7 @@ class SharedProsperityUserRepository extends BaseRepository
         foreach ($list as $index => &$item) {
             $teamUserIds = $this->dao->getAllSubordinateUserIds($item['user_id'], false, 4);
             $teamTotalCount = count($teamUserIds);
-            $teamPvSum = $this->dao->getTeamPvSum($item['user_id'], 4);
+            $teamPvSum = $this->dao->getTeamPvSum($item['user_id'], 4, true);
             $item['team_total_count'] = $teamTotalCount;
             $item['team_pv_sum'] = $teamPvSum;
             // 补充用户信息
@@ -807,6 +808,50 @@ class SharedProsperityUserRepository extends BaseRepository
 
     /**
      * @param $userId
+     * @param $parentId
+     * @param $remark
+     * @param $operator
+     * @return string|void
+     * @throws DbException
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author 史晨
+     * @date 2026/3/16 09:35
+     * 更新用户上级
+     */
+    public function updateParent($userId, $parentId, $remark, $operator)
+    {
+        if ($userId == $parentId) {
+            return '不能设置自己为上级';
+        }
+        $userInfo = $this->dao->getWhere(['user_id' => $userId]);
+        if ($parentId == $userInfo->parent_id) {
+            return '上级未发生变化';
+        }
+        Db::startTrans();
+        try {
+            // 变更等级
+            $this->dao->updateByUserId($userId, ['parent_id' => $parentId]);
+            // 记录日志
+            /** @var SharedProsperityUserParentLogDao $logDao */
+            $logDao = app()->make(SharedProsperityUserParentLogDao::class);
+            $logDao->create([
+                'user_id' => $userId,
+                'old_parent' => $userInfo->parent_id,
+                'new_parent' => $parentId,
+                'operator' => $operator,
+                'remark' => $remark
+            ]);
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            return $e->getMessage();
+        }
+    }
+
+
+    /**
+     * @param $userId
      * @param $type
      * @param $number
      * @return bool

app/controller/admin/system/sharedProsperity/SharedProsperityUser.php

@@ -61,4 +61,25 @@ class SharedProsperityUser
         }
         return app('json')->success('更新成功');
     }
+
+    /**
+     * @return mixed
+     * @author 史晨
+     * @date 2026/3/16 09:30
+     * 更新用户上级
+     */
+    public function updateParent()
+    {
+        /** @var SharedProsperityUserRepository $repository */
+        $repository = app()->make(SharedProsperityUserRepository::class);
+        $params = app('request')->params(['user_id', 'parent_id', 'remark']);
+        if (empty($params['user_id']) || empty($params['parent_id'] || empty($params['remark']))) {
+            return app('json')->fail('参数错误');
+        }
+        $res = $repository->updateParent($params['user_id'], $params['parent_id'], $params['remark'], request()->adminId());
+        if (is_string($res)) {
+            return app('json')->fail($res);
+        }
+        return app('json')->success('更新成功');
+    }
 }

app/controller/api/Auth.php

@@ -1695,6 +1695,14 @@ class Auth extends BaseController
             return app('json')->fail('手机号未注册，请先注册');
         }
 
+        // 获取实名状态
+        $ertification = Db::name("user_certification")->where("uid", $user["uid"])->where(['status'=>1])->find();
+        $is_ertification = 1;
+        if (!$ertification){
+            $is_ertification = -1;
+        }
+        $user["is_ertification"] = $is_ertification;
+
         // if($this->source=='yhc' && $this->merId){
         //     $where=['mer_id'=>$this->merId,'uid'=>$user->uid];
         //     $count=Db::name('enterprise_user')->where($where)->count();

config/console.php

@@ -36,5 +36,6 @@ return [
         'wiwibaoproductsync' => 'app\command\WiwibaoProductSync',
         'sharedPartnerConsumeUpdate' => 'app\command\SharedPartnerConsumeUpdate',
         'productPriceUpdate' => 'app\command\ProductPriceUpdate',
+        'deleteApiLog' => 'app\command\DeleteApiLog',
     ],
 ];

route/admin.php

@@ -124,6 +124,8 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
         Route::get('sharedProsperity/user/updateLevel', 'admin.system.sharedProsperity.SharedProsperityUser/updateLevel');
         // 修改共富会员奖励
         Route::get('sharedProsperity/user/updateReward', 'admin.system.sharedProsperity.SharedProsperityUser/updateReward');
+        // 修改共富会员上级
+        Route::get('sharedProsperity/user/updateParent', 'admin.system.sharedProsperity.SharedProsperityUser/updateParent');
 
         //组合数据
         Route::group('group', function () {