Commit e351a41d authored by wwccw0591's avatar wwccw0591

pc

parent a7605196
...@@ -129,9 +129,11 @@ class MessageController extends \Our\Controller_AbstractApi { ...@@ -129,9 +129,11 @@ class MessageController extends \Our\Controller_AbstractApi {
} }
public function setAction(){ public function setAction(){
$messageService = \Business\Message\MessageServiceModel::getInstance(); $messageService = \Business\Message\MessageServiceModel::getInstance();
$type=$this->req['data']['type']; $pushSet['canPush']=$this->req['data']['canPush'];
if(!empty($type)){ $pushSet['sound']=$this->req['data']['sound'];
$res=$messageService->set($this->memberId,$type); $pushSet['vibrate']=$this->req['data']['vibrate'];
if(isset($pushSet['canPush'])&& isset($pushSet['sound']) && isset($pushSet['vibrate']) ){
$res=$messageService->set($this->memberId,$pushSet);
if($res){ if($res){
$this->success(\Our\DescribeConst::setMessageSuccess); $this->success(\Our\DescribeConst::setMessageSuccess);
} }
......
...@@ -445,9 +445,9 @@ class MessageServiceModel extends \Business\AbstractModel ...@@ -445,9 +445,9 @@ class MessageServiceModel extends \Business\AbstractModel
return false; return false;
} }
} }
public function set($memberId,$type){ public function set($memberId,$pushData){
$memberDao=\DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName); $memberDao=\DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
if($memberDao->setIsWxsend($memberId,$type)!==false){ if($memberDao->setIsWxsend($memberId,$pushData)!==false){
return true; return true;
} }
return false; return false;
......
...@@ -29,10 +29,15 @@ class MemberCenterServiceModel extends \Business\AbstractModel ...@@ -29,10 +29,15 @@ class MemberCenterServiceModel extends \Business\AbstractModel
$memberInfo['diliverymanId'] ? $memberCenter['isDeliveryman'] = 1 : $memberCenter['isDeliveryman'] = 0; $memberInfo['diliverymanId'] ? $memberCenter['isDeliveryman'] = 1 : $memberCenter['isDeliveryman'] = 0;
//是否店主 //是否店主
$memberInfo['storeId'] ? $memberCenter['isSeller'] = 1 : $memberCenter['isSeller'] = 0; $memberInfo['storeId'] ? $memberCenter['isSeller'] = 1 : $memberCenter['isSeller'] = 0;
if($memberInfo['isWxsend']>=ApiConst::zero){
$memberCenter['canSendMsg']=ApiConst::canSendMsg; if(!empty($memberInfo['pushSet'])){
$memberInfo['pushSet']=unserialize($memberInfo['pushSet']);
}else{ }else{
$memberCenter['canSendMsg']=ApiConst::cannotSendMsg; $memberInfo['pushSet']=array(
'canPush'=>ApiConst::openMessae,
'sound'=>ApiConst::openMessae,
'vibrate'=>ApiConst::openMessae,
);
} }
$memberInfo['storeId'] ? $memberCenter['is'] = 1 : $memberCenter['isSeller'] = 0; $memberInfo['storeId'] ? $memberCenter['is'] = 1 : $memberCenter['isSeller'] = 0;
//是否销售员 //是否销售员
...@@ -42,6 +47,9 @@ class MemberCenterServiceModel extends \Business\AbstractModel ...@@ -42,6 +47,9 @@ class MemberCenterServiceModel extends \Business\AbstractModel
$sale_act = $saleInstance->getOneByMIdCache($memberId); $sale_act = $saleInstance->getOneByMIdCache($memberId);
$sale_act ? $memberCenter['isSalesman'] = 1 : $memberCenter['isSalesman'] = 0; $sale_act ? $memberCenter['isSalesman'] = 1 : $memberCenter['isSalesman'] = 0;
$memberCenter['memberMobile'] = \DAO\MemberModel::getInstance()->getInfo($memberId)['memberMobile']; $memberCenter['memberMobile'] = \DAO\MemberModel::getInstance()->getInfo($memberId)['memberMobile'];
$memberCenter['canPush']= (int)$memberInfo['pushSet']['canPush'];
$memberCenter['sound']= (int)$memberInfo['pushSet']['sound'];
$memberCenter['vibrate']=(int)$memberInfo['pushSet']['vibrate'];
return $memberCenter; return $memberCenter;
} }
public function getStatistics($memberId){ public function getStatistics($memberId){
......
...@@ -176,6 +176,7 @@ class MemberModel extends \DAO\AbstractModel ...@@ -176,6 +176,7 @@ class MemberModel extends \DAO\AbstractModel
'storeId' => (int)$member['store_id'], 'storeId' => (int)$member['store_id'],
'memberAvatarUrl' => $member['memberAvatarUrl'], 'memberAvatarUrl' => $member['memberAvatarUrl'],
'isWxsend'=>$member['is_wxsend'], 'isWxsend'=>$member['is_wxsend'],
'pushSet'=>$member['push_set'],
); );
} else { } else {
$member = $this->getOneByMemberId($memberId, '*'); $member = $this->getOneByMemberId($memberId, '*');
...@@ -197,6 +198,7 @@ class MemberModel extends \DAO\AbstractModel ...@@ -197,6 +198,7 @@ class MemberModel extends \DAO\AbstractModel
'storeId' => $member['store_id'], 'storeId' => $member['store_id'],
'memberAvatarUrl' => $member['memberAvatarUrl'], 'memberAvatarUrl' => $member['memberAvatarUrl'],
'isWxsend'=>$member['is_wxsend'], 'isWxsend'=>$member['is_wxsend'],
'pushSet'=>$member['push_set'],
); );
foreach ($member as $key => $value) { foreach ($member as $key => $value) {
if (empty($value) || is_null($value)) { if (empty($value) || is_null($value)) {
...@@ -580,13 +582,14 @@ class MemberModel extends \DAO\AbstractModel ...@@ -580,13 +582,14 @@ class MemberModel extends \DAO\AbstractModel
$this->changeNum($memberId, $fromState, null, -1); $this->changeNum($memberId, $fromState, null, -1);
$this->changeNum($memberId, $toState, null, 1); $this->changeNum($memberId, $toState, null, 1);
} }
public function setIsWxsend($memberId,$type){ public function setIsWxsend($memberId,$pushData){
if(in_array($type,array(ApiConst::closeMessage,ApiConst::openMessae))){ foreach($pushData as $val){
$data['is_wxsend']=$type; if(!in_array($val,array(ApiConst::closeMessage,ApiConst::openMessae))){
}else{ ErrorModel::throwException(CodeConfigModel::paramsError);
ErrorModel::throwException(CodeConfigModel::paramsError); }
} }
if(isset( $data['is_wxsend'])){ $data['push_set']=serialize($pushData);
if(isset( $data['push_set'])){
$res=$this->saveInfo($data,$memberId); $res=$this->saveInfo($data,$memberId);
return $res; return $res;
} }
......
...@@ -10,8 +10,10 @@ ...@@ -10,8 +10,10 @@
<body> <body>
<form action="/message/set" method="post"> <form action="/message/set" method="post">
用户登录状态key:<input name="data[key]" value="ca44044c38f5a6d06ddd7304e1c7666c"/><br /> 用户登录状态key:<input name="data[key]" value="ca44044c38f5a6d06ddd7304e1c7666c"/><br />
是否 接受消息:<input name="data[type]" value="1"/><br /> 是否 接受消息:<input name="data[canPush]" value="1"/><br />
是否 接受消息:<input name="data[debug]" value="1"/><br /> 声音消息:<input name="data[sound]" value="1"/><br />
是否震动:<input name="data[vibrate]" value="0"/><br />
debug:<input name="data[debug]" value="1"/><br />
<input type="submit" value="提交"> <input type="submit" value="提交">
</form> </form>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment