|
@@ -12,6 +12,7 @@ namespace app\love\controller;
|
|
|
|
|
|
use app\common\Constant;
|
|
|
use app\common\Fun;
|
|
|
+use app\love\model\LotteryPrizeModel;
|
|
|
use app\love\model\UserFavoriteModel;
|
|
|
use app\love\model\UserFriendModel;
|
|
|
use app\love\model\UserGiftModel;
|
|
@@ -28,7 +29,6 @@ use think\Db;
|
|
|
class MyController extends LoveBaseController
|
|
|
{
|
|
|
private $base_arr = ['nation', 'company', 'job', 'hobby', 'smoke', 'drink'];
|
|
|
- private $mating_arr = [];
|
|
|
|
|
|
/**
|
|
|
* 我的
|
|
@@ -89,6 +89,16 @@ class MyController extends LoveBaseController
|
|
|
])->count();
|
|
|
$this->assign('select_count', $select_count ?: '');
|
|
|
|
|
|
+ //是否互选
|
|
|
+ $select_log = 'false';
|
|
|
+ if ($this->user['sex'] == 1 && $this->user['use_ticket'] == 2) {
|
|
|
+ $log_check = UserSelectLogModel::where('user_id1', $this->user['id'])->find();
|
|
|
+ if (!empty($log_check)) {
|
|
|
+ $select_log = 'true';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $this->assign('select_log', $select_log);
|
|
|
+
|
|
|
return $this->fetch();
|
|
|
}
|
|
|
|
|
@@ -366,6 +376,9 @@ class MyController extends LoveBaseController
|
|
|
$select = UserSelectModel::where('user_id|uid', '=', $user_id)
|
|
|
->where('is_confirm', 1)
|
|
|
->find();
|
|
|
+ //奖品
|
|
|
+ $has_prize = LotteryPrizeModel::all();
|
|
|
+ $this->assign('has_prize', $has_prize->isEmpty() ? 'false' : 'true');
|
|
|
if (!empty($select)) {
|
|
|
//已选择
|
|
|
if ($select['user_id'] == $user_id) {
|
|
@@ -459,7 +472,7 @@ class MyController extends LoveBaseController
|
|
|
$user = UserSelectModel::get(['user_id' => $id, 'uid' => $user_id]);
|
|
|
}
|
|
|
if (!empty($user)) {
|
|
|
- UserSelectLogModel::where('user_id1|user_id2', $id)->update('delete_time',time());
|
|
|
+ UserSelectLogModel::where('user_id1|user_id2', $id)->update(['delete_time'=>time()]);
|
|
|
$user->delete();
|
|
|
}
|
|
|
|
|
@@ -476,8 +489,8 @@ class MyController extends LoveBaseController
|
|
|
if ($user_id == $id) {
|
|
|
$this->error('不可以选择自己!');
|
|
|
}
|
|
|
- $user = UserSelectModel::get(['user_id' => $id, 'uid' => $user_id]);
|
|
|
- $check = UserSelectLogModel::where('user_id1|user_id2', $id)->find();
|
|
|
+ $user = UserSelectModel::get(['user_id' => $id, 'uid' => $user_id]);
|
|
|
+ $check = UserSelectLogModel::where('user_id1|user_id2', $id)->find();
|
|
|
if (!empty($check)) {
|
|
|
$this->error('对方已被选择!');
|
|
|
}
|
|
@@ -534,25 +547,28 @@ class MyController extends LoveBaseController
|
|
|
}
|
|
|
|
|
|
//增加互选次数
|
|
|
- Db::name('config')->where('id',1)->setInc('select_num');
|
|
|
- /*//发送提示
|
|
|
+ Db::name('config')->where('id', 1)->setInc('select_num');
|
|
|
+ //发送提示
|
|
|
+ $form_id = $this->user->sex = 1 ? $user_id : $id;
|
|
|
+ $to_id = $this->user->sex = 1 ? $id : $user_id;
|
|
|
$time = time();
|
|
|
UserMessageModel::create([
|
|
|
- 'from_id' => $user_id,
|
|
|
- 'to_id' => $id,
|
|
|
- 'message' => '我已接受你的交往请求,快来一起聊天吧!',
|
|
|
+ 'from_id' => $form_id,
|
|
|
+ 'to_id' => $to_id,
|
|
|
+ 'message' => '系统赠送了两张咖啡券,约个时间一起去喝咖啡吧。',
|
|
|
'create_time' => $time,
|
|
|
]);
|
|
|
|
|
|
//增加最后聊天消息
|
|
|
- UserFriendModel::update(['last_msg' => '我:我已接受你的交往请求,快来一起聊天吧!', 'last_msg_time' => $time], ['user_id' => $user_id, 'friend_id' => $id]);
|
|
|
- $friend = UserFriendModel::get(['user_id' => $id, 'friend_id' => $user_id]);
|
|
|
- $friend->last_msg = '对方:我已接受你的交往请求,快来一起聊天吧!';
|
|
|
+ UserFriendModel::update(['last_msg' => '我:系统赠送了两张咖啡券,约个时间一起去喝咖啡吧。', 'last_msg_time' => $time], ['user_id' => $form_id, 'friend_id' => $to_id]);
|
|
|
+ $friend = UserFriendModel::get(['user_id' => $to_id, 'friend_id' => $form_id]);
|
|
|
+ $friend->last_msg = '对方:系统赠送了两张咖啡券,约个时间一起去喝咖啡吧。';
|
|
|
$friend->last_msg_time = $time;
|
|
|
$friend->unread_num++;
|
|
|
- $friend->save();*/
|
|
|
+ $friend->save();
|
|
|
|
|
|
- $this->success('操作成功');
|
|
|
+ $other = UserModel::get($id);
|
|
|
+ $this->success('操作成功', '', ['mobile' => $other['mobile']]);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -561,13 +577,13 @@ class MyController extends LoveBaseController
|
|
|
public function marry()
|
|
|
{
|
|
|
$user_id = cmf_get_current_user_id();
|
|
|
- $log = UserSelectLogModel::where('user_id1|user_id2', $user_id)->find();
|
|
|
+ $log = UserSelectLogModel::where('user_id1|user_id2', $user_id)->find();
|
|
|
if (empty($log)) {
|
|
|
$this->error('请先确认关系后再结婚!');
|
|
|
}
|
|
|
|
|
|
- $id = $log['user_id1'] == $user_id ? $log['user_id2'] : $log['user_id1'];
|
|
|
- $marry = UserMarryModel::where(function ($query) use ($user_id, $id) {
|
|
|
+ $id = $log['user_id1'] == $user_id ? $log['user_id2'] : $log['user_id1'];
|
|
|
+ $marry = UserMarryModel::where(function ($query) use ($user_id, $id) {
|
|
|
$query->where([
|
|
|
['user_id1', '=', $user_id],
|
|
|
['user_id2', '=', $id],
|
|
@@ -581,11 +597,11 @@ class MyController extends LoveBaseController
|
|
|
//20230423增加两个userid对调的查询,因为双方都有权利取消
|
|
|
if (empty($marry)) {
|
|
|
UserMarryModel::create(['user_id1' => $user_id, 'user_id2' => $id, 'create_time' => time()]);
|
|
|
- UserModel::where('id','in',[$id,$user_id])->update(['is_marry'=>1]);
|
|
|
+ UserModel::where('id', 'in', [$id, $user_id])->update(['is_marry' => 1]);
|
|
|
}
|
|
|
|
|
|
//增加结婚次数
|
|
|
- Db::name('config')->where('id',1)->setInc('marry_num');
|
|
|
+ Db::name('config')->where('id', 1)->setInc('marry_num');
|
|
|
|
|
|
$this->success('操作成功');
|
|
|
}
|
|
@@ -782,6 +798,31 @@ class MyController extends LoveBaseController
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 咖啡券
|
|
|
+ */
|
|
|
+ public function ticket()
|
|
|
+ {
|
|
|
+ //是否互选
|
|
|
+ if ($this->user['sex'] == 2) {
|
|
|
+ $this->error('暂无咖啡券', url('index'));
|
|
|
+ }
|
|
|
+ $log_check = UserSelectLogModel::where('user_id1', $this->user['id'])->find();
|
|
|
+ if (empty($log_check)) {
|
|
|
+ $this->error('暂无咖啡券', url('index'));
|
|
|
+ }
|
|
|
+
|
|
|
+ return $this->fetch();
|
|
|
+ }
|
|
|
+
|
|
|
+ public function useTicket()
|
|
|
+ {
|
|
|
+ $this->user->use_ticket = 1;
|
|
|
+ $this->user->save();
|
|
|
+
|
|
|
+ $this->success('核销成功!');
|
|
|
+ }
|
|
|
+
|
|
|
private function _file_name($ext)
|
|
|
{
|
|
|
//生成随机文件名
|