clientOrder

application/models/Business/Cart/CartService.php

@@ -1255,11 +1255,12 @@ class CartServiceModel extends \Business\AbstractModel{
 
 
     function addOrder($data,$memberId,$currentAddress){
+        $postData = json_decode($data['param'],true);
         $orderUtil =\Order\OrderConfirmUtil::getInstance();
         $return = $orderUtil->addOrder($data,$memberId,$currentAddress);
         //删除订单列表缓存
         $orderDao=\DAO\Order\OrderModel::getInstance();
-        $orderDao->deleteOrderCache($memberId);
+        $orderDao->deleteOrderCache($memberId,false,($postData['storeId'])?$postData['storeId']:$postData[0]['storeId']);
 
         return $return;
     }

application/models/Business/Store/ShopkeeperService.php

@@ -296,14 +296,14 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $orderDao = \DAO\Order\OrderModel::getInstance();
         $goodsDao = \DAO\GoodsModel::getInstance();
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance();
-        $returnData = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, $orderDao->getOrderDetailField(), $pageIndex, $pageSize, $order, \Our\ApiConst::oneDaySecond, array($storeId)));
+        $returnData = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, $orderDao->getOrderDetailField(), $pageIndex, $pageSize, $order), \Our\ApiConst::oneDaySecond, array($storeId));
         $orders = $returnData['list'];
         if (!empty($orders)) {
             $orderIds = array_column($orders, 'orderId');
             if (!empty($orderIds)) {
-                $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderIds, $orderGoodsDao->orderGoodsField), \Our\ApiConst::oneDaySecond, array($storeId));
+                $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderIds, $orderGoodsDao->orderGoodsField), \Our\ApiConst::oneDaySecond, array($storeId));
                 //$orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $orderGoodsDao->orderGoodsField);
-                $orderCommons=\Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'getAllByOrderIds'), array($orderIds, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond, array($storeId));
+                $orderCommons=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderCommonDao, 'getAllByOrderIds'), array($orderIds, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond, array($storeId));
                 //$orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
                 $ordersOrderCommons = Common::intergrateOneToOne($orders, $orderCommons, 'orderId', 'orderId');
                 $orderMerge = \Our\Common::intergrateOneToMany($ordersOrderCommons, $orderGoods, 'orderId', 'orderId', 'orderGoods');

application/models/DAO/Order/Order.php

@@ -849,11 +849,14 @@ class OrderModel extends \DAO\AbstractModel
     }
 
     //删除订单列表缓存
-    public function deleteGetListByMemberId($memberId)
+    public function deleteGetListByMemberId($storeId)
     {
-        return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getList'), array(), array($memberId));
+        return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getList'), array(), array($storeId));
     }
 
+    public function deleteStoreOrderListCacheByStoreId($storeId){
+        return \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$this, 'getList'), array(), array($storeId));
+    }
     //删除订单缓存
     public function deleteOrderCache($memberId, $orderId = false, $stroeId = false, $deleteGetShopKeeperCountByStoreId = false, $deleteGetFavoritesCountByStoreId = false,$diliverymanId=ApiConst::zero)
     {
@@ -863,17 +866,16 @@ class OrderModel extends \DAO\AbstractModel
             \DAO\MemberModel::getInstance()->deleteTotalCache($memberId);
         }
         if (!empty($stroeId)) {
+
             if ($deleteGetShopKeeperCountByStoreId) {
                 $this->deleteGetShopKeeperCountByStoreId($stroeId);
             }
             if ($deleteGetFavoritesCountByStoreId) {
                 $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
                 $favoritesStoreDao->deleteGetFavoritesCountByStoreId($stroeId);
-
             }
-            $this->deleteGetListByMemberId($stroeId);
+            $this->deleteStoreOrderListCacheByStoreId($stroeId);
             $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
-
             \DAO\Store\MemberFavoritesStoreStoreMemberStatisticsModel::getInstance()->deleteCacheGetGoodsCountOrderTotalByStoreId($stroeId);
             $orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId,$stroeId);
         }