Skip to content

M
my-yaf-project
Commit 3ba260d9 authored by christ's avatar christ
Browse files
Options

clientpushModify

parent 338ec5ad
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 43 deletions
application/library/Our/ApiConst.php
View file @ 3ba260d9
...@@ -64,6 +64,7 @@ class ApiConst ...@@ -64,6 +64,7 @@ class ApiConst
//数字 //数字
const zero = 0; const zero = 0;
const one = 1; const one = 1;
const reduceOne=-1;
const two = 2; const two = 2;
const four=4; const four=4;
const cannotSendMsg=-1; const cannotSendMsg=-1;
...@@ -418,6 +419,7 @@ class ApiConst ...@@ -418,6 +419,7 @@ class ApiConst
const deliveryOrderType = 16; const deliveryOrderType = 16;
//pcClient 消息推送消息模板类型常量 //pcClient 消息推送消息模板类型常量
const messageWaitReceive=101; const messageWaitReceive=101;
const messageRefund=102;
//待配送 //待配送
const messageWaitSend=102; const messageWaitSend=102;
//待自提 //待自提
......
application/library/Our/NameConst.php
View file @ 3ba260d9
...@@ -173,7 +173,7 @@ class NameConst { ...@@ -173,7 +173,7 @@ class NameConst {
const pcClient='pc-client'; const pcClient='pc-client';
const add='add'; const add='add';
const reduce='reduce'; const change='change';
const set='set'; const set='set';
......
application/models/Business/Order/OrderService.php
View file @ 3ba260d9
...@@ -332,7 +332,23 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -332,7 +332,23 @@ class OrderServiceModel extends \Business\AbstractModel
$orderGoodsDao->update($where,$orderGoodsUpdateData); $orderGoodsDao->update($where,$orderGoodsUpdateData);
} }
} }
\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId']))); $push=\Our\Push::getInstance();
$pushData=array('storeId'=>$order['storeId'],
'type'=>ApiConst::messageWaitReceive,
'waitReceiveCount'=>ApiConst::reduceOne,
'waitDeliveryCount'=>ApiConst::zero,
'waitGetCount'=>ApiConst::zero,
'orderCount'=>ApiConst::reduceOne,
'waitRefundProccessCount'=>ApiConst::zero,
'waitRefundReceiveCount'=>ApiConst::zero,
'refundCount'=>ApiConst::zero,
'alertCount'=>ApiConst::zero,
'params'=>array('c'=>'shopkeeper',
'm'=>'orderDetail',
'orderId'=>$order['orderId']));
$push->addOneToClient($pushData);
$push->sendTcpMessage();
//\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
if ($memberId) { if ($memberId) {
$orderDao->deleteOrderCache($memberId, $orderId, $order['storeId'],true); $orderDao->deleteOrderCache($memberId, $orderId, $order['storeId'],true);
// $memberDao->fromOrderStateToOrderState($memberId,$order['order_state'],ApiConst::orderStateCancel); // $memberDao->fromOrderStateToOrderState($memberId,$order['order_state'],ApiConst::orderStateCancel);
...@@ -362,7 +378,23 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -362,7 +378,23 @@ class OrderServiceModel extends \Business\AbstractModel
}else{ }else{
$type=ApiConst::messageWaitSend; $type=ApiConst::messageWaitSend;
} }
\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId']))); $push=\Our\Push::getInstance();
$pushData=array('storeId'=>$order['store_id'],
'type'=>ApiConst::messageWaitReceive,
'waitReceiveCount'=>ApiConst::zero,
'waitDeliveryCount'=>($type==ApiConst::messageWaitSend)?ApiConst::reduceOne:ApiConst::zero,
'waitGetCount'=>($type==ApiConst::messageWaitGet)?ApiConst::reduceOne:ApiConst::zero,
'orderCount'=>ApiConst::reduceOne,
'waitRefundProccessCount'=>ApiConst::zero,
'waitRefundReceiveCount'=>ApiConst::zero,
'refundCount'=>ApiConst::zero,
'alertCount'=>ApiConst::zero,
'params'=>array('c'=>'shopkeeper',
'm'=>'orderDetail',
'orderId'=>$order['order_id']));
$push->addOneToClient($pushData);
$push->sendTcpMessage();
// \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
$orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true,true); $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true,true);
return true; return true;
} else { } else {
...@@ -436,7 +468,23 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -436,7 +468,23 @@ class OrderServiceModel extends \Business\AbstractModel
public function pushRecieveOrder($order){ public function pushRecieveOrder($order){
$push = Push::getInstance(); $push = Push::getInstance();
$push->recieveWait($order['storeId'], $order['orderId'], $order['orderSn']); $push->recieveWait($order['storeId'], $order['orderId'], $order['orderSn']);
\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId']))); $push=\Our\Push::getInstance();
$pushData=array('storeId'=>$order['storeId'],
'type'=>ApiConst::messageWaitReceive,
'waitReceiveCount'=>ApiConst::one,
'waitDeliveryCount'=>ApiConst::zero,
'waitGetCount'=>ApiConst::zero,
'orderCount'=>ApiConst::one,
'waitRefundProccessCount'=>ApiConst::zero,
'waitRefundReceiveCount'=>ApiConst::zero,
'refundCount'=>ApiConst::zero,
'alertCount'=>ApiConst::zero,
'params'=>array('c'=>'shopkeeper',
'm'=>'orderDetail',
'orderId'=>$order['orderId']));
$push->addOneToClient($pushData);
$push->sendTcpMessage();
// \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
$push->sendTcpMessage(); $push->sendTcpMessage();
$messageService=\Business\Message\MessageServiceModel::getInstance(\Our\DbNameConst::masterDBConnectName); $messageService=\Business\Message\MessageServiceModel::getInstance(\Our\DbNameConst::masterDBConnectName);
$messageService->addMessageCenterToDb(); $messageService->addMessageCenterToDb();
......
application/models/Business/Order/RefundService.php
View file @ 3ba260d9
...@@ -843,7 +843,23 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -843,7 +843,23 @@ class RefundServiceModel extends \Business\AbstractModel
$refundStateName=$refundReturnDao->getRefundTextStatus($refundArrayUnLine); $refundStateName=$refundReturnDao->getRefundTextStatus($refundArrayUnLine);
$orderGoodsDao->update(array('rec_id'=>$orderGoods['recId']),array('refund_state_name'=>$refundStateName,'refund_id'=>$state)); $orderGoodsDao->update(array('rec_id'=>$orderGoods['recId']),array('refund_state_name'=>$refundStateName,'refund_id'=>$state));
$orderLogDao->addRefundOrderLog($orderInfo['orderId'],$refundArray['refund_type'],DescribeConst::buyer,$orderInfo['buyerName'],$orderInfo['orderState']); $orderLogDao->addRefundOrderLog($orderInfo['orderId'],$refundArray['refund_type'],DescribeConst::buyer,$orderInfo['buyerName'],$orderInfo['orderState']);
\Our\RedisHelper::rpush('client_push',array('storeId'=>$refund['storeId'],'type'=>ApiConst::messageRefundProccessing,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'getRefundDetail','refundId'=>$refund['refundId']))); $push=\Our\Push::getInstance();
$pushData=array('storeId'=>$orderInfo['storeId'],
'type'=>ApiConst::messageRefund,
'waitReceiveCount'=>ApiConst::zero,
'waitDeliveryCount'=>ApiConst::zero,
'waitGetCount'=>ApiConst::zero,
'orderCount'=>ApiConst::zero,
'waitRefundProccessCount'=>ApiConst::one,
'waitRefundReceiveCount'=>ApiConst::zero,
'refundCount'=>ApiConst::one,
'alertCount'=>ApiConst::zero,
'params'=>array('c'=>'shopkeeper',
'm'=>'orderDetail',
'orderId'=>$orderInfo['orderId']));
$push->addOneToClient($pushData);
$push->sendTcpMessage();
//\Our\RedisHelper::rpush('client_push',array('storeId'=>$refund['storeId'],'type'=>ApiConst::messageRefundProccessing,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'getRefundDetail','refundId'=>$refund['refundId'])));
if ($orderInfo['orderState'] == ApiConst::orderStateWaitRecieve) { if ($orderInfo['orderState'] == ApiConst::orderStateWaitRecieve) {
$orderDao->editOrderLock($orderInfo['orderId']); $orderDao->editOrderLock($orderInfo['orderId']);
} }
......
application/models/Business/Store/ShopkeeperService.php
View file @ 3ba260d9
...@@ -253,8 +253,24 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -253,8 +253,24 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
}else{ }else{
$type=ApiConst::messageWaitSend; $type=ApiConst::messageWaitSend;
} }
\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId']))); $push=\Our\Push::getInstance();
\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId']))); $pushData=array('storeId'=>$order['store_id'],
'type'=>ApiConst::messageWaitReceive,
'waitReceiveCount'=>ApiConst::reduceOne,
'waitDeliveryCount'=>($type==ApiConst::messageWaitSend)?ApiConst::one:ApiConst::zero,
'waitGetCount'=>($type==ApiConst::messageWaitGet)?ApiConst::one:ApiConst::zero,
'orderCount'=>ApiConst::zero,
'waitRefundProccessCount'=>ApiConst::zero,
'waitRefundReceiveCount'=>ApiConst::zero,
'refundCount'=>ApiConst::zero,
'alertCount'=>ApiConst::zero,
'params'=>array('c'=>'shopkeeper',
'm'=>'orderDetail',
'orderId'=>$order['order_id']));
$push->addOneToClient($pushData);
$push->sendTcpMessage();
// \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
//\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
$orderDao->deleteOrderCache($order['buyer_id'], $orderId, $order['store_id'], true); $orderDao->deleteOrderCache($order['buyer_id'], $orderId, $order['store_id'], true);
// \Our\RedisHelper::memberTotalFromStateToState($order['buyer_id'], $order['order_state'], ApiConst::orderStateWaitSend); // \Our\RedisHelper::memberTotalFromStateToState($order['buyer_id'], $order['order_state'], ApiConst::orderStateWaitSend);
return $result; return $result;
......
application/models/Business/User/MemberService.php
View file @ 3ba260d9
...@@ -67,7 +67,7 @@ class MemberServiceModel extends \Business\AbstractModel ...@@ -67,7 +67,7 @@ class MemberServiceModel extends \Business\AbstractModel
$storeFd=$storeRedisDb0->tableHGet(trim($member['store_id']),'fd'); $storeFd=$storeRedisDb0->tableHGet(trim($member['store_id']),'fd');
if(!empty($storeFd)){ if(!empty($storeFd)){
$push=\Our\Push::getInstance(); $push=\Our\Push::getInstance();
$push->addOneToClient(array('storeId'=>$member['store_id'],'type'=>\Our\ApiConst::messageOtherLogin,'op'=>\Our\NameConst::logOut,'num'=>\Our\ApiConst::zero,'params'=>array('c'=>'member','m'=>'logOut'))); $push->addOneToClient(array('storeId'=>$member['store_id'],'type'=>\Our\ApiConst::messageOtherLogin,'params'=>array('c'=>'member','m'=>'logOut')));
$push->sendTcpMessage(); $push->sendTcpMessage();
} }
$this->updataSellerToken($member); $this->updataSellerToken($member);
......
public/test.html
View file @ 3ba260d9
<!DOCTYPE html> <table class="">
<html lang="en"> <tbody>
<head> <tr>
<meta charset="UTF-8"> <td> type</td>
<title>淘宝网主页</title>
</head> <td> 订单管理(orderCount)</td>
<body> <td> 售后管理（refundCount）</td>
<td> 待处理(waitRefundProccessCount)</td>
<img style="vertical-align: middle" src="https://img.alicdn.com/imgextra/i2/766294303/TB2VK3usL5TBuNjSspcXXbnGFXa_!!766294303.jpg" width="180" height="95" <td> 待收货(waitRefundReceiveCount)</td>
border="10">
你好<br /> <td> 待接单（waitReceiveCount）</td>
<img style="vertical-align: top; " src="https://img.alicdn.com/imgextra/i2/766294303/TB2VK3usL5TBuNjSspcXXbnGFXa_!!766294303.jpg" width="180" height="95" <td> 待配送(waitDeliveryCount)</td>
border="0"> <td> 待自提（waitGetCount）</td>
你好<br > <td> 库存管理(alertCount)</td>
<hr size="5" color="red" width="300"> <td> 当前活动菜单</td>
<hr size="10" color="black"width="200"> <td> 是否根据params参数请求接口</td>
<hr size="5" color="#ea68a2" width="50%"> </tr>
<hr size="300" color="#ea68a2" width="1"> <tr>
<td> 101 </td>
<td>1/-1/0</td>
<td> 0</td>
</body> <td> 0</td>
</html> <td> 0</td>
\ No newline at end of file
<td>1/-1<br></td>
<td> 1/-1</td>
<td> 1/-1</td>
<td> 0</td>
<td> 全部订单/待付款</td>
<td> 如过列表中存在 orderId=params[orderId]
请求接口 c/m 参数orderId=params[orderId]
用返回的数据更新 列表orderId=params[orderId]那条数据</td>
</tr>
<tr>
<td> 102</td>
<td> </td>
<td>1/-1<br></td>
<td> 1/-1</td>
<td> 1/-1</td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> 全部售后订单</td>
<td> 如过列表中存在 refundId=params[<span style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">refundId</span>]
请求接口 c/m 参数<span style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">refundId</span>=params[<span style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">refundId</span>]
用返回的数据更新 列表<span style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">refundId</span>=params[<span style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">refundId</span>]那条数据</td>
</tr>
<tr>
<td> 106</td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td>=alertCount</td>
<td> 库存管理</td>
<td>重新请求库存预警列表接口</td>
</tr>
<tr>
<td> 107</td>
<td> 当前账号在其他地方登陆请求退出登陆接口</td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
</tr>
<tr>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
</tr>
<tr>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
</tr>
</tbody>
</table><p><br></p>
\ No newline at end of file
scripts/crontab/push/jpush.php
View file @ 3ba260d9
...@@ -73,16 +73,9 @@ class cliOrderClose extends basecli ...@@ -73,16 +73,9 @@ class cliOrderClose extends basecli
$redis->close(); $redis->close();
} }
protected function autoPushClient(){ protected function autoPushClient(){
$conf = \Yaf\Registry::get('config')->get('redis.database.params');
$redis = new \Redis();
$redis->pconnect($conf['host'], $conf['port']);
if (!empty($conf['password'])) {
$redis->auth($conf['password']);
}
$push=\Our\Push::getInstance(); $push=\Our\Push::getInstance();
while($pushData=$redis->lPop('client_push')){ while($pushData=\Our\RedisHelper::lpop('client_push')){
$addData = unserialize($pushData); $push->addOneToClient($pushData);
$push->addOneToClient($addData);
} }
$goodsCommonService=\Business\Goods\GoodsCommonServiceModel::getInstance(); $goodsCommonService=\Business\Goods\GoodsCommonServiceModel::getInstance();
$storesBase=$goodsCommonService->getAlertGoods(); $storesBase=$goodsCommonService->getAlertGoods();
...@@ -91,7 +84,7 @@ class cliOrderClose extends basecli ...@@ -91,7 +84,7 @@ class cliOrderClose extends basecli
$stores=$goodsCommonService->getGoodsCount($storesIds); $stores=$goodsCommonService->getGoodsCount($storesIds);
if(!empty($stores)){ if(!empty($stores)){
foreach($stores as $store){ foreach($stores as $store){
$addData=array('storeId'=>$store['storeId'],'type'=>\Our\ApiConst::messageGoodsAlert,'op'=>\Our\NameConst::set,'num'=>$store['count'],'params'=>array()); $addData=array('storeId'=>$store['storeId'],'type'=>\Our\ApiConst::messageGoodsAlert,array(),'params'=>array());
$push->addOneToClient($addData); $push->addOneToClient($addData);
} }
...@@ -99,7 +92,6 @@ class cliOrderClose extends basecli ...@@ -99,7 +92,6 @@ class cliOrderClose extends basecli
} }
$push->sendTcpMessage(); $push->sendTcpMessage();
$redis->close();
} }
protected function _runCli() protected function _runCli()
{ {
......
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