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

application/library/Payment/Pay.php

@@ -48,7 +48,7 @@ class Pay {
             $prepayId = $wxLitePay->getPrepayId();
             if($prepayId) {
                 $dbName = \Our\DbNameConst::masterDBConnectName;
-                \DAO\Order\OrderModel::getInstance($dbName)->update(array('pay_sn'=>$data['paySn']), array('prepay_id'=>$prepayId));
+                \DAO\Order\OrderModel::getInstance($dbName)->update(array('pay_sn'=>$orderInfo['paySn']), array('prepay_id'=>$prepayId));
             }
         }else if($data['channel'] == \Our\NameConst::qqAppChannel){
             $qPay = QPay::getInstance();

application/models/Business/Store/ShopkeeperService.php

@@ -508,8 +508,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
             ErrorModel::throwException(CodeConfigModel::emptyStoreId);
         }
         $diliveryMan = \DAO\Order\DiliverymanModel::getInstance();
-        $diliveryMans=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$diliveryMan, 'getDeliveryManByStoreId'), array($storeId), \Our\ApiConst::oneDaySecond, array($storeId));
-       // $diliveryMans=$diliveryMan->getDeliveryManByStoreId($storeId);
+       // $diliveryMans=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$diliveryMan, 'getDeliveryManByStoreId'), array($storeId), \Our\ApiConst::oneDaySecond, array($storeId));
+        $diliveryMans=$diliveryMan->getDeliveryManByStoreId($storeId);
         foreach($diliveryMans as &$dilivery){
             $dilivery['memberAvatar']=$memberDao->getMemberAvatar($dilivery['memberId']);
         }