|
|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
namespace app\user\controller;
|
|
|
use think\Lang;
|
|
|
+use app\user\model\UserMessage;
|
|
|
|
|
|
class Message extends UserControl
|
|
|
{
|
|
|
@@ -15,26 +16,38 @@ class Message extends UserControl
|
|
|
|
|
|
public function index()
|
|
|
{
|
|
|
- $message = Model('Userproduct');
|
|
|
- $condition['user_id'] = session('user_id');
|
|
|
+ $message = new UserMessage();
|
|
|
+ $user_id = session('user_id');
|
|
|
+
|
|
|
+ $condition = array();
|
|
|
+
|
|
|
+ $condition['user_id'] = array('=',$user_id);
|
|
|
|
|
|
$time = input('get.timeRang');
|
|
|
if (!empty($time)) {
|
|
|
$gap = explode(' - ', $time);
|
|
|
$begin = $gap[0];
|
|
|
$end = date('Y-m-d', strtotime ("+1 day", strtotime($gap[1])));
|
|
|
- $condition['userProduct_buyTime'] = array('between', array($begin, $end));
|
|
|
+ $condition['userMessage_create'] = array('between', array($begin, $end));
|
|
|
}
|
|
|
$type = input('get.type');
|
|
|
if ($type) {
|
|
|
if($type == -1){
|
|
|
- $condition['userProduct_maturityTime'] = array('<',date('Y-m-d',time()));
|
|
|
+ $condition['userMessage_status'] = array('<',date('Y-m-d',time()));
|
|
|
}
|
|
|
if($type == 1){
|
|
|
- $condition['userProduct_maturityTime'] = array('>=',date('Y-m-d',time()));
|
|
|
+ $condition['userMessage_status'] = array('>=',date('Y-m-d',time()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $usermessage = $message->getUserMessage($condition);
|
|
|
+ for($i=0;$i<count($usermessage);$i++){
|
|
|
+ if($usermessage[$i]['userMessage_status'] == 1){
|
|
|
+ $usermessage[$i]['userMessage_status'] = '已读';
|
|
|
+ }
|
|
|
+ if($usermessage[$i]['userMessage_status'] == 0){
|
|
|
+ $usermessage[$i]['userMessage_status'] = '未读';
|
|
|
}
|
|
|
}
|
|
|
- $usermessage = $message->getUserProduct($condition);
|
|
|
$this->assign('show_page', $usermessage->render());
|
|
|
$this->assign('usermessage', $usermessage);
|
|
|
|