pc

application/models/Business/Order/OrderService.php

@@ -645,6 +645,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $beginTime = file_get_contents($this->baseDir . \Our\PathConst::orderCancelTime, TIMESTAMP);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP - ApiConst::orderCancelBeyondTime;
+        $storeDao=\DAO\StoreModel::getInstance();
         $orders = $orderDao->getMustCecelOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
         if (!empty($orders)) {
 
@@ -665,6 +666,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     echo '订单:'.$order['order_id'].'is_refund'.'没更新成功';
                 }
                 $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
+                $storeDao->deleteStoreCache($order['storeId'],$order['orderId']);
             }
             $orderIds = array_column($orders, 'orderId');
             //更新商品库存
@@ -703,6 +705,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $beginTime = file_get_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, TIMESTAMP);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP - ApiConst::orderStateWaitConfirmBeyond;
+        $storeDao=\DAO\StoreModel::getInstance();
        // $beginTime=0;
         $orders = $orderDao->getMustCecelRecieveOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
         if (!empty($orders)) {
@@ -716,6 +719,7 @@ class OrderServiceModel extends \Business\AbstractModel
                         }
                     }
                     $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
+                    $storeDao->deleteStoreCache($order['storeId'],$order['orderId']);
                     $push=\Our\Push::getInstance();
                     $pushData=array('storeId'=>$order['store_id'],
                         'type'=>ApiConst::messageWaitReceive,

application/models/Business/Order/RefundService.php

@@ -400,7 +400,7 @@ class RefundServiceModel extends \Business\AbstractModel
      * @param int $pageSize
      * @return \stdClass
      */
-    public function getStoreRefundList($storeId, $type=0,$pageIndex = ApiConst::zero, $pageSize = ApiConst::pageSize)
+    public function getStoreRefundList($storeId, $type=0,$pageIndex = ApiConst::zero, $pageSize = ApiConst::pageSize,$refundId=false)
     {
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
 
@@ -415,18 +415,23 @@ class RefundServiceModel extends \Business\AbstractModel
 //        $where['store_id'] = $storeId;
 //        $where['order_lock'] = 2;
         $order = array('add_time' => 'desc');
-        if($type==ApiConst::zero){
-            $where['store_id'] = $storeId;
+        if($refundId){
+            $where['refund_id']=$refundId;
         }else{
-            if($type==ApiConst::refundSellerVerify){
-                $where=$refundReturnDao->getProccessOrderBySeller($storeId);
-            }
-            if($type==ApiConst::refundSellerAgree){
-                $where=$refundReturnDao->getReturnWaitReceive($storeId);
-                $order= array('receive_time'=> 'asc');
+            if($type==ApiConst::zero){
+                $where['store_id'] = $storeId;
+            }else{
+                if($type==ApiConst::refundSellerVerify){
+                    $where=$refundReturnDao->getProccessOrderBySeller($storeId);
+                }
+                if($type==ApiConst::refundSellerAgree){
+                    $where=$refundReturnDao->getReturnWaitReceive($storeId);
+                    $order= array('receive_time'=> 'asc');
+                }
             }
         }
 
+
         //获得售后列表
         $refundReturns = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$refundReturnDao, 'getList'), array($where, $this->storeRefundReturnField, $pageIndex, $pageSize,$order), \Our\ApiConst::oneDaySecond, array($storeId));
         $orderGoodsId = array_column($refundReturns['list'], 'orderGoodsId');
@@ -480,7 +485,25 @@ class RefundServiceModel extends \Business\AbstractModel
             return new \stdClass();
         }
     }
+    public function getStoreRefundDetail($storeId,$returnId){
+        $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance();
+        $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance();
+        $orderDao= \DAO\Order\OrderModel::getInstance();
+        $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
+        $storeDao = \DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
+        $goodsDao = \DAO\GoodsModel::getInstance();
+        $refundReturn = $refundReturnDao->findByRefundId($returnId, $this->refundReturnField);
+        $diliveryManDao=\DAO\Order\DiliverymanModel::getInstance(DbNameConst::salveDBConnectName);
+        if (empty($refundReturn)) {
+            ErrorModel::throwException(CodeConfigModel::notExistRefund);
+        }
+        $res=$this->getStoreRefundList($storeId,$returnId);
+        if(!empty($res['refundReturns'][ApiConst::zero])) {
+            return $res['refundReturns'][ApiConst::zero];
+        }
+        return new \stdClass();
 
+    }
     /**
      * 退款列表
      *

application/models/Business/Store/ShopkeeperService.php

@@ -482,11 +482,21 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
 
     }
 
+    public function getOrderDetail($storeId, $orderId){
+        $where['order_id']=$orderId;
+        $returnData = $this->getRetrunDatas($storeId, $where, ApiConst::pageIndex, ApiConst::pageSize);
+        if(!empty($returnData['orders'])){
+            return $returnData['orders'][ApiConst::zero];
+        }else{
+            return new \stdClass();
+        }
+    }
     /**
      * 订单详情
      */
-    public function getOrderDetail($memberId, $orderId)
+    public function getOrderDetail_bak($memberId, $orderId)
     {
+
         $storeId = $this->_getStoreByMemberId($memberId);
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);

application/modules/Client/controllers/Shopkeeper.php

@@ -169,7 +169,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         if(empty($orderId)){
             ErrorModel::throwException(CodeConfigModel::emptyOrderIdForPay);
         }
-        $result = $this->shopkeeperService->getOrderDetail($this->memberId,$orderId);
+        $result = $this->shopkeeperService->getOrderDetail($this->storeId,$orderId);
         $this->success($result);
         if($result){
             $this->success(array(),\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
@@ -325,8 +325,8 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
      * @ccw
      */
     public function getRefundDetailAction(){
-        $refundService =\Business\Order\RefundServiceModel::getInstance();
-        $res=$refundService->getInfo($this->req[\Our\NameConst::data]['refundId']);
+        $refundService=\Business\Order\RefundServiceModel::getInstance();
+        $res=$refundService->getStoreRefundDetail($this->storeId,$this->req[\Our\NameConst::data]['refundId']);
         $this->success($res);
     }