pc

application/models/Business/Abstract.php

 <?php
 
 namespace Business;
+use Our\NameConst;
 
 /**
  * 业务层的抽象类
  */
 abstract class AbstractModel {
+    public $clientType=NameConst::pcClient;
 
     /**
      * 不允许克隆对象

application/models/Business/Order/OrderService.php

@@ -327,7 +327,7 @@ class OrderServiceModel extends \Business\AbstractModel
                         $orderGoodsDao->update($where,$orderGoodsUpdateData);
                     }
                 }
-                \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('id'=>$order['orderId'])));
+                \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','id'=>$order['orderId'])));
                 if ($memberId) {
                     $orderDao->deleteOrderCache($memberId, $orderId, $order['storeId'],true);
                     // $memberDao->fromOrderStateToOrderState($memberId,$order['order_state'],ApiConst::orderStateCancel);
@@ -357,7 +357,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 }else{
                     $type=ApiConst::messageWaitSend;
                 }
-                \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('id'=>$order['orderId'])));
+                \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','id'=>$order['orderId'])));
                 $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true,true);
                 return true;
             } else {
@@ -431,7 +431,7 @@ class OrderServiceModel extends \Business\AbstractModel
     public function pushRecieveOrder($order){
         $push = Push::getInstance();
         $push->recieveWait($order['storeId'], $order['orderId'], $order['orderSn']);
-        \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('id'=>$order['orderId'])));
+        \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','id'=>$order['orderId'])));
         $push->sendTcpMessage();
         $messageService=\Business\Message\MessageServiceModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $messageService->addMessageCenterToDb();

application/models/Business/Order/RefundService.php

@@ -795,7 +795,7 @@ class RefundServiceModel extends \Business\AbstractModel
             $refundStateName=$refundReturnDao->getRefundTextStatus($refundArrayUnLine);
             $orderGoodsDao->update(array('rec_id'=>$orderGoods['recId']),array('refund_state_name'=>$refundStateName,'refund_id'=>$state));
             $orderLogDao->addRefundOrderLog($orderInfo['orderId'],$refundArray['refund_type'],DescribeConst::buyer,$orderInfo['buyerName'],$orderInfo['orderState']);
-            \Our\RedisHelper::rpush('client_push',array('storeId'=>$refund['storeId'],'type'=>ApiConst::messageRefundProccessing,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('id'=>$refund['refundId'])));
+            \Our\RedisHelper::rpush('client_push',array('storeId'=>$refund['storeId'],'type'=>ApiConst::messageRefundProccessing,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'getRefundDetail','id'=>$refund['refundId'])));
             if ($orderInfo['orderState'] == ApiConst::orderStateWaitRecieve) {
                 $orderDao->editOrderLock($orderInfo['orderId']);
             }
@@ -881,6 +881,11 @@ class RefundServiceModel extends \Business\AbstractModel
         }else{
             $info['diliveryman']=new \stdClass();
         }
+        if($this->clientType==NameConst::pcClient){
+            $orderDao=\DAO\Order\OrderModel::getInstance();
+            $orderCommon=$orderDao->getClienOrderCommon($info['orderId']);
+            $info=array_merge($info,$orderCommon);
+        }
         if (!$refundReturn) {
             ErrorModel::throwException(CodeConfigModel::orderError);
         } else {

application/models/Business/Store/ShopkeeperService.php

@@ -34,7 +34,6 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
     private $lastFavId;
     private $taskIndex;
     private $taskSize;
-    public $clientType = false;
 
     public function init()
     {
@@ -254,8 +253,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
             }else{
                 $type=ApiConst::messageWaitSend;
             }
-            \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('id'=>$order['orderId'])));
-            \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('id'=>$order['orderId'])));
+            \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','id'=>$order['orderId'])));
+            \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','id'=>$order['orderId'])));
             $orderDao->deleteOrderCache($order['buyer_id'], $orderId, $order['store_id'], true);
             //   \Our\RedisHelper::memberTotalFromStateToState($order['buyer_id'], $order['order_state'], ApiConst::orderStateWaitSend);
             return $result;

application/models/DAO/Order/Order.php

@@ -1095,7 +1095,17 @@ class OrderModel extends \DAO\AbstractModel
      * pcClient 获得订单数量
      */
 
+   public function getClienOrderCommon($orderId){
+       $returnData=array();
+       $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond, array($orderId));
+       $returnData['couponAmount'] = ($order['goodsAmount'] + $order['shippingFee']) - $order['orderAmount'];//优惠券金额
+       $returnData['receiveAmount'] = $order['goodsAmount'] - $returnData['couponAmount'];
+       $returnData['orderAmount'] = $order['orderAmount'] + $returnData['couponAmount'];
+       $returnData['shippingFee']=$order['shippingFee'];
+       return $returnData;
 
+
+   }
     public function getCountByOrderState($storeId,$orderState){
             $where['store_id']=$storeId;
             $where['order_state']=$orderState;

application/modules/Client/controllers/Shopkeeper.php

@@ -246,6 +246,8 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         $this->success($res);
     }
 
+
+
     /**
      * 同意退款
      */
@@ -314,6 +316,18 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         $this->success($res);
     }
 
+
+    /**
+     * 获得退款详情接口
+     *
+     * @ccw
+     */
+    public function getRefundDetailAction(){
+        $refundService =\Business\Order\RefundServiceModel::getInstance();
+        $res=$refundService->getInfo($this->req[\Our\NameConst::data]['refundId']);
+        $this->success($res);
+    }
+
 }
 
 

application/modules/Client/controllers/User.php

@@ -64,13 +64,16 @@ class UserController extends \Our\Controller_AbstractIndex {
                     session_id($this->key);
                     $this->sess['member_id']=(int)$member['member_id'];
                     $this->sess['store_id']=(int)$seller['storeId'];
+                    $this->sess['seller_name']=$seller['sellerName'];
+                    $this->sess['seller_id']=$seller['sellerId'];
                     $this->sess[NameConst::sessionKey]=$this->key;
                     $member[NameConst::sessionKey]=$this->key;
                     $member['store_id']=$seller['storeId'];
                     $member['seller_id']=$seller['sellerId'];
+                    $member['seller_name']=$seller['sellerName'];
                     //通知退出
                     $push=\Our\Push::getInstance();
-                    $push->addOneToClient(array('storeId'=>$member['store_id'],'type'=>\Our\ApiConst::messageOtherLogin,'op'=>NameConst::logOut,'params'=>array('c'=>'member','m'=>'logOut')));
+                    $push->addOneToClient(array('storeId'=>$member['store_id'],'type'=>\Our\ApiConst::messageOtherLogin,'op'=>NameConst::logOut,'num'=>0,'params'=>array('c'=>'member','m'=>'logOut')));
                     $push->sendTcpMessage();
                     $this->memberService->saveMember($member,'seller');
                     $this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberMobile'=>$member['member_mobile'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>(int)$member['member_id'],'storeId'=>(int)$seller['storeId']));