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

application/models/Business/Order/OrderService.php

@@ -750,23 +750,23 @@ class OrderServiceModel extends \Business\AbstractModel
                             'orderId'=>$order['orderId']));
                     $push->addOneToClient($pushData);
                 }
-                $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
-                $storeDao->deleteStoreCache($order['storeId'],$order['orderId']);
-                $push=\Our\Push::getInstance();
-                $pushData=array('storeId'=>$order['storeId'],
-                    'type'=>ApiConst::messageWaitReceive,
-                    'waitReceiveCount'=>ApiConst::reduceOne,
-                    'waitDeliveryCount'=>0,
-                    'waitGetCount'=>0,
-                    '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);
+//                $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
+//                $storeDao->deleteStoreCache($order['storeId'],$order['orderId']);
+//                $push=\Our\Push::getInstance();
+//                $pushData=array('storeId'=>$order['storeId'],
+//                    'type'=>ApiConst::messageWaitReceive,
+//                    'waitReceiveCount'=>ApiConst::reduceOne,
+//                    'waitDeliveryCount'=>0,
+//                    'waitGetCount'=>0,
+//                    '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);
 
             }
 

application/models/Business/Order/RefundService.php

@@ -83,11 +83,11 @@ class RefundServiceModel extends \Business\AbstractModel
      * @param $receiveTime
      */
     public function setReceiveTime($storeId, $refundId, $receiveTime) {
-        $receiveTime = strtotime($receiveTime);
         if($receiveTime < TIMESTAMP){
             ErrorModel::throwException(CodeConfigModel::commonError);
         }
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
+        $storeDao=\DAO\StoreModel::getInstance(DbNameConst::masterDBConnectName);
         $whereRefund  = array();
         $whereRefund['store_id']= $storeId;
         $whereRefund['refund_id']= $refundId;
@@ -96,7 +96,9 @@ class RefundServiceModel extends \Business\AbstractModel
         if(!$refund) {  //未知的退款信息
             ErrorModel::throwException(CodeConfigModel::notExistRefund);
         }
+
         $state = $refundReturnDao->update(array('refund_id'=> $refundId), array('receive_time'=> $receiveTime));
+        $storeDao->deleteStoreRefundCache($storeId);
         if(!$state){
             return false;
         }

application/models/Business/Store/ShopkeeperService.php

@@ -279,7 +279,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
             //\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);
             $storeDao->deleteStoreCache($order['store_id'],$orderId);
-            //   \Our\RedisHelper::memberTotalFromStateToState($order['buyer_id'], $order['order_state'], ApiConst::orderStateWaitSend);
+            //\Our\RedisHelper::memberTotalFromStateToState($order['buyer_id'], $order['order_state'], ApiConst::orderStateWaitSend);
             return $result;
         }
     }