Commit f1b6451d authored by wwccw0591's avatar wwccw0591

pc

parent 8dc3a899
...@@ -85,8 +85,9 @@ class ApiConst ...@@ -85,8 +85,9 @@ class ApiConst
const storeMessageType = 4; const storeMessageType = 4;
//普通用户消息类型 //普通用户消息类型
const memberMessageType = 5; const memberMessageType = 5;
//配送员用户消息类型
//快递消息
const deliveryUserMessageType = 8;
const ordinaryMessage=0; const ordinaryMessage=0;
const onePictureMessage=21; const onePictureMessage=21;
const reacheCallMessage=1; const reacheCallMessage=1;
...@@ -397,7 +398,7 @@ class ApiConst ...@@ -397,7 +398,7 @@ class ApiConst
//消息模板类型 //消息模板类型
const reachRemindMessageType = 1; const reachRemindMessageType = 1;
const waitRecieveOrderType = 15; const waitRecieveOrderType = 15;
const deliveryOrderType = 16;
//消息按钮类型 //消息按钮类型
const messageButtonTypeConfirmButton = 1;//确认收货 const messageButtonTypeConfirmButton = 1;//确认收货
const messageButtonTypeReciverButton = 2;//确认接单 const messageButtonTypeReciverButton = 2;//确认接单
......
...@@ -154,6 +154,8 @@ class DescribeConst ...@@ -154,6 +154,8 @@ class DescribeConst
const reacheRemindTitle='你的订单卖家已经送达'; const reacheRemindTitle='你的订单卖家已经送达';
const reacheRemindContent='你有新的订单号为{0}的订单已经已经送达'; const reacheRemindContent='你有新的订单号为{0}的订单已经已经送达';
const deliveryRemindTitle='你有新的配送订单';
//店铺有新订单 //店铺有新订单
const recieveWaitTitle='您有新的订单'; const recieveWaitTitle='您有新的订单';
const recieveWaitContent='您有新的订单号为{0}的订单,是否需要接单'; const recieveWaitContent='您有新的订单号为{0}的订单,是否需要接单';
......
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2018/10/23
* Time: 19:01
*/
namespace Our;
class MemberIdConst
{
const deliveryId = 395;//店铺首页顶部广告位
const deliveryMessageName = '配送消息';//店铺首页中部广告位
}
\ No newline at end of file
...@@ -164,6 +164,27 @@ class Push ...@@ -164,6 +164,27 @@ class Push
$id = time() . (string)$this->orderIdStr.$orderId; $id = time() . (string)$this->orderIdStr.$orderId;
$this->pushMessage($id,$this->orderId,$toId,$this->orderId,$toUserId,$this->orderName,$member['memberName'],ApiConst::orderMessageType,ApiConst::memberMessageType,$fromAvatar,$message); $this->pushMessage($id,$this->orderId,$toId,$this->orderId,$toUserId,$this->orderName,$member['memberName'],ApiConst::orderMessageType,ApiConst::memberMessageType,$fromAvatar,$message);
} }
//配送提醒
public function deliveryRemind($toId,$orderId)
{
$memberDao = \DAO\MemberModel::getInstance();
$member = $memberDao->getInfo($toId);
$toId=$toId;
$toUserId=$toId;
$orderService=\Business\Order\OrderServiceModel::getInstance();
$orderDetail=$orderService->getOrderDetail($orderId);
$messageContent=$this->getOrderMessageContent($orderDetail);
$href=Common::format(PathConst::orderId,$orderId);
$fromAvatar=Common::getStaticFile(ImageConst::orderAvatarName, ImageConst::systemAvatar);
// $buttons=$this->getRecieveButtons($orderId);
$message=$this->getMessageTemplate(ApiConst::deliveryOrderType,DescribeConst::deliveryRemindTitle,$messageContent,'','',$href,ApiConst::zero);
$id = time() . (string)$this->orderIdStr.$orderId;
$this->pushMessage($id,\Our\MemberIdConst::deliveryId,$toId,\Our\MemberIdConst::deliveryId,$toUserId,\Our\MemberIdConst::deliveryMessageName,$member['memberName'],ApiConst::orderMessageType,ApiConst::deliveryUserMessageType,$fromAvatar,$message);
}
public function sendDelivery($toId,$orderId){
$this->deliveryRemind($toId,$orderId);
$this->sendTcpMessage();
}
private function getButton($buttonType,$name,$buttonId,$params){ private function getButton($buttonType,$name,$buttonId,$params){
return array( return array(
'type'=>$buttonType, 'type'=>$buttonType,
...@@ -197,7 +218,7 @@ class Push ...@@ -197,7 +218,7 @@ class Push
$messageContent.=$orderGood['goodsName'].'×'.$orderGood['goodsNum']."\n"; $messageContent.=$orderGood['goodsName'].'×'.$orderGood['goodsNum']."\n";
} }
$messageContent.='支付方式:'.ArrayConst::paymentTypes[$orderDetail['paymentType']]."\n"; $messageContent.='支付方式:'.ArrayConst::paymentTypes[$orderDetail['paymentType']]."\n";
$messageContent.='付款状态:'.(ArrayConst::paymentTypes[$orderDetail['paymentTime']]>ApiConst::zero?DescribeConst::payed:DescribeConst::notPayed)."\n"; $messageContent.='付款状态:'.($orderDetail['paymentTime']>ApiConst::zero?DescribeConst::payed:DescribeConst::notPayed)."\n";
$messageContent.='收货地址:'.$orderDetail['reciverInfo']['address']."\n"; $messageContent.='收货地址:'.$orderDetail['reciverInfo']['address']."\n";
$messageContent.='收货人:'.$orderDetail['reciverInfo']['trueName']."\n"; $messageContent.='收货人:'.$orderDetail['reciverInfo']['trueName']."\n";
$messageContent.='收货人电话:'.$orderDetail['reciverInfo']['mobPhone']."\n"; $messageContent.='收货人电话:'.$orderDetail['reciverInfo']['mobPhone']."\n";
......
...@@ -442,7 +442,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -442,7 +442,7 @@ class OrderServiceModel extends \Business\AbstractModel
file_put_contents($savePath, TIMESTAMP); file_put_contents($savePath, TIMESTAMP);
} }
//推送确认收货消息到用户 //推送确认收货消息到用户 和配送
public function pushConfirmOrder() public function pushConfirmOrder()
{ {
$baseConfDir = \Our\Common::getConfig('out.config'); $baseConfDir = \Our\Common::getConfig('out.config');
...@@ -450,6 +450,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -450,6 +450,7 @@ class OrderServiceModel extends \Business\AbstractModel
$addTime = file_get_contents($savePath); $addTime = file_get_contents($savePath);
$addTime = $addTime ? $addTime : ApiConst::zero; $addTime = $addTime ? $addTime : ApiConst::zero;
$orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName); $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
$qmDeliverymanLogDao = \DAO\Order\QmDeliverymanLogModel::getInstance(DbNameConst::salveDBConnectName);
$pageBegin = PageConst::taskPageBegin; $pageBegin = PageConst::taskPageBegin;
$push = Push::getInstance(); $push = Push::getInstance();
do { do {
...@@ -462,6 +463,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -462,6 +463,7 @@ class OrderServiceModel extends \Business\AbstractModel
$push->reacheRemind($order['buyerId'], $order['orderId'], $order['orderSn']); $push->reacheRemind($order['buyerId'], $order['orderId'], $order['orderSn']);
} }
} }
$pageBegin++; $pageBegin++;
} while (!empty($orders['list'])); } while (!empty($orders['list']));
$push->sendTcpMessage(); $push->sendTcpMessage();
......
...@@ -84,7 +84,15 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel ...@@ -84,7 +84,15 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel
* @param $pageSize * @param $pageSize
* @return array * @return array
*/ */
//任务脚本方法
public function getSendOrders($orderState, $addTime, $pageIndex, $pageSize, $timeField = 'add_time')
{
$this->setDb($this->dbName);
$where['order_state'] = ApiConst::orderStateWaitConfirm;
$where = Common::format(' get_time BETWEEN{1}>={2} and {1}<{3}', $orderState, $timeField, $addTime, TIMESTAMP);
$list = $this->lists($where, array('add_time' => 'asc'), $this->getOrderDetailField(), $pageIndex, $pageSize);
return $list;
}
public function getListByDeliverymanIdAndType($diliveryId, $type, $pageIndex, $pageSize, $order = array('get_time' => 'desc')) public function getListByDeliverymanIdAndType($diliveryId, $type, $pageIndex, $pageSize, $order = array('get_time' => 'desc'))
{ {
$this->setDb($this->dbName); $this->setDb($this->dbName);
......
<?php <?php
/** /**
* 推送确认收货消息到用户 * 推送确认收货消息到用户 和配送订单给配送员
* 执行时间:每分钟执行一次 * 执行时间:每分钟执行一次
* *
* @author chenjiebin <sjlinyu@qq.com> * @author chenjiebin <sjlinyu@qq.com>
......
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