Commit a9c78a18 authored by chenchuanwen's avatar chenchuanwen

myself

parent 434102e1
...@@ -849,8 +849,9 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -849,8 +849,9 @@ class OrderServiceModel extends \Business\AbstractModel
public function canformRecieveOrder() public function canformRecieveOrder()
{ {
$orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName); $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
$memberDao=\DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
$qmDeliverymanLogsDao = \DAO\Order\QmDeliverymanLogModel::getInstance(DbNameConst::masterDBConnectName); $qmDeliverymanLogsDao = \DAO\Order\QmDeliverymanLogModel::getInstance(DbNameConst::masterDBConnectName);
$orders = $orderDao->getOrdersByOrderState(ApiConst::orderStateWaitRecieve, 'accept_time', ApiConst::orderWaitRecieveTwentyFourHours, $this->orderMessageField, array(ApiConst::bySeller, ApiConst::express)); $orders = $orderDao->getOrdersByOrderState(ApiConst::orderStateWaitRecieve, 'accept_time', ApiConst::orderWaitRecieveTwentyFourHours, $this->orderMessageField, array(ApiConst::bySeller, ApiConst::bySelf));
if (!empty($orders)) { if (!empty($orders)) {
$sellerTypeOrderIds = $orderDao->getShippingTypeSellerOrdersByOrders($orders); $sellerTypeOrderIds = $orderDao->getShippingTypeSellerOrdersByOrders($orders);
$qmDeliverymanLogs = $qmDeliverymanLogsDao->getFinishDeliveryByOrderId($sellerTypeOrderIds); $qmDeliverymanLogs = $qmDeliverymanLogsDao->getFinishDeliveryByOrderId($sellerTypeOrderIds);
...@@ -864,15 +865,24 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -864,15 +865,24 @@ class OrderServiceModel extends \Business\AbstractModel
if ($order['shippingType'] == ApiConst::bySeller) { if ($order['shippingType'] == ApiConst::bySeller) {
if (isset($qmDeliverymanLogsOrderIds[$order['orderId']])) { if (isset($qmDeliverymanLogsOrderIds[$order['orderId']])) {
array_push($sellerOrderIds, $order['orderId']); array_push($sellerOrderIds, $order['orderId']);
$orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'],true); $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'], true);
} }
} else { }
if($order['shippingType'] == ApiConst::bySelf){
$limitTime = TIMESTAMP - ApiConst::orderWaitRecieveThreeDays; $limitTime = TIMESTAMP - ApiConst::orderWaitRecieveThreeDays;
if ($order['acceptTime'] < $limitTime) { if ($order['acceptTime'] < $limitTime) {
array_push($expressOrderIds, $order['orderId']); array_push($expressOrderIds, $order['orderId']);
$orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'],true); $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'],true);
} }
} }
// } else {
// $limitTime = TIMESTAMP - ApiConst::orderWaitRecieveThreeDays;
// if ($order['acceptTime'] < $limitTime) {
// array_push($expressOrderIds, $order['orderId']);
// $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'],true);
// }
// }
$memberDao->deleteTotalCache($order['buyerId']);
\Our\RedisHelper::memberTotalFromStateToState($order['buyerId'], $order['orderState'], ApiConst::orderStateComplete); \Our\RedisHelper::memberTotalFromStateToState($order['buyerId'], $order['orderState'], ApiConst::orderStateComplete);
} }
$updateOrderIds = array_merge($sellerOrderIds, $expressOrderIds); $updateOrderIds = array_merge($sellerOrderIds, $expressOrderIds);
......
...@@ -104,6 +104,7 @@ class DeliveryServiceModel extends \Business\AbstractModel ...@@ -104,6 +104,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
$orderDao->deleteOrderCache(null, $data['orderId'], $data['storeId'], true,false,$deliveryManMemberIds); $orderDao->deleteOrderCache(null, $data['orderId'], $data['storeId'], true,false,$deliveryManMemberIds);
$storeDao->deleteStoreCache($data['storeId'],$data['orderId']); $storeDao->deleteStoreCache($data['storeId'],$data['orderId']);
$storeDao->deleteStoreRefundCache($data['storeId'],$data['orderId']); $storeDao->deleteStoreRefundCache($data['storeId'],$data['orderId']);
$orderDao->deleteOrderCache($orderD['buyerId'],$orderD['orderId']);
//配送员推送 //配送员推送
$push=\Our\Push::getInstance(); $push=\Our\Push::getInstance();
if($data['orderType']==ApiConst::orderTypeRefund){ if($data['orderType']==ApiConst::orderTypeRefund){
......
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