Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/models/Business/Order/OrderService.php

@@ -878,7 +878,7 @@ class OrderServiceModel extends \Business\AbstractModel
 //                } else {
 //                    $limitTime = TIMESTAMP - ApiConst::orderWaitRecieveThreeDays;
 //                    if ($order['acceptTime'] < $limitTime) {
-//                        array_push($expressOrderIds, $order['orderId']);
+//                        array_push($expressOrderIds, $order['orderId']);z
 //                        $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'],true);
 //                    }
 //                }

application/models/Business/Store/DeliveryService.php

@@ -121,6 +121,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $memberDao=\DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
         $deliveryManDao=\DAO\Order\DiliverymanModel::getInstance(DbNameConst::masterDBConnectName);
         $member=$memberDao->getByMemberMobile($memberMobile);
+        $storeDao=\DAO\StoreModel::getInstance();
         $memberMobile=$member['memberMobile'];
         if(strlen($memberMobile)>ApiConst::telephoneLen || !$memberMobile){
                 ErrorModel::throwException(CodeConfigModel::notExsitDeliveryMan);
@@ -147,7 +148,8 @@ class DeliveryServiceModel extends \Business\AbstractModel
         }
         $memberData['diliveryman_id']=$resData;
         $memberDao->saveInfo($memberData,$member['memberId']);
-
+        $storeDao->deleteStoreCache($storeId);
+        $storeDao->deleteStoreRefundCache($storeId);
 //        $memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
 //        $memberDb0Redis->tableHSet(trim($member['diliveryman_id']),$resData,ApiConst::tenDaySecond);
         return $resData;

application/models/DAO/Store.php

@@ -285,10 +285,11 @@ class StoreModel extends \DAO\AbstractModel
     }
     public function deleteStoreCache($storeId,$orderId){
         $qmDeliveryManLogDao =\DAO\Order\QmDeliverymanLogModel::getInstance();
+        $diliveryMan = \DAO\Order\DiliverymanModel::getInstance();
         if(!empty($storeId)){
             \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$this, 'getList'), array(), array($storeId));
             \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$qmDeliveryManLogDao, 'getList'), array(), array($storeId));
-
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$diliveryMan, 'getDeliveryManByStoreId'), array(), array($storeId));
         }
         if(!empty($orderId)){
             $orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);