From d01dbe195c5dc2886ce4bf62d66d7459cefda667 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 13 七月 2023 11:36:39 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.4开发' of http://60.204.153.149:8081/r/dfgApi into feature/v1.1.4开发
---
application/api/controller/User.php | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 412d90e..a50f2e1 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -20,6 +20,8 @@
use app\api\logic\UserMoneyLog as LogicUserMoneyLog;
use think\log;
use app\api\logic\ActivityInfo as InfoActivityInfo;
+use app\common\model\UserExtend as ModelUserExtend;
+use think\Db;
/**
* 浼氬憳鎺ュ彛
@@ -727,7 +729,7 @@
$ModelUser->commit();
//鏇存柊鎷涘嫙娲诲姩淇℃伅
$activityInfo=new InfoActivityInfo();
- $activityInfo->updateRecruitCount($user['id']);
+ $activityInfo->updateRecruitCount($save_data['invitation_id'] );
$this->success('缁戝畾鎴愬姛',[]);
}
@@ -1050,4 +1052,20 @@
$this->success('鑾峰彇鎴愬姛',$user);
}
+ /**
+ * 妫�娴嬫槸鍚︽湁鍋忓ソ鍟嗗搧
+ *
+ * @return void
+ */
+
+ public function check_preference_goods()
+ {
+ //鑾峰彇褰撳墠鐧诲綍浜虹敤鎴蜂俊鎭�
+ $user = $this->auth->getUser();
+ $ModelUserExtend=new ModelUserExtend();
+ $preference_goods=$ModelUserExtend->where(['id'=>$user['id']])->field('p_cids,p_platefrom')->find();
+ if(empty($preference_goods)||empty($preference_goods['p_cids'])) $this->error('鏆傛棤鍋忓ソ鍟嗗搧');
+ $this->success('鑾峰彇鎴愬姛',$preference_goods);
+ }
+
}
--
Gitblit v1.9.3