pc

application/library/Our/Push.php

@@ -235,6 +235,24 @@ class Push
 
     }
     //用户被接单消息
+    public function updateOrderAmount($storeId,$orderId,$orderSn)
+    {
+        $storeDao=\DAO\StoreModel::getInstance();
+        $condition['store_id'] = $storeId;
+        $store = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeDao, 'getInfo'), array($condition), ApiConst::oneDaySecond, array($storeId));
+        //$store = $storeDao->getInfo(array('store_id'=>$storeId));
+        $orderService=\Business\Order\OrderServiceModel::getInstance();
+        $orderDetail=$orderService->getOrderDetail($orderId);
+        $toUserId=$orderDetail['buyerId'];
+        $messageContent=$this->getOrderMessageContent($orderDetail);
+        $fromAvatar=Common::getStaticFile(ImageConst::orderAvatarName, ImageConst::systemAvatar);
+        $href=Common::format(PathConst::orderId,$orderId);
+        // $buttons=$this->getComfirmRecieveButtons($orderId);
+        $message=$this->getMessageTemplate(ApiConst::reicieveOrderType,DescribeConst::recieveOrderTitle,$messageContent,'','',$href,ApiConst::zero);
+        $id = time() . (string)$this->orderIdStr.$orderId;
+        $this->pushMessage($id,$this->orderId,$orderDetail['buyerId'],$this->orderId,$toUserId,$this->orderName,$store['store_name'],ApiConst::orderMessageType,ApiConst::memberMessageType,$fromAvatar,$message);
+    }
+    //用户被接单消息
     public function recievedOrder($storeId,$orderId,$orderSn)
     {
         $storeDao=\DAO\StoreModel::getInstance();

application/models/Business/Order/OrderService.php

@@ -983,6 +983,9 @@ class OrderServiceModel extends \Business\AbstractModel
         }
         $data['order_amount']=$newOrderAmount;
         $res=$orderDao->updateByOrderId($data,$orderId);
+        $push=\Our\Push::getInstance();
+        $push->recievedOrder($orderDetail['storeId'], $orderDetail['orderId'], $orderDetail['orderSn']);
+        $push->sendTcpMessage();
         $orderDao->deleteOrderCache($orderDetail['memberId'], $orderId, $storeId, true);
         $storeDao->deleteStoreCache($storeId,$orderId);
         $orderLogDao->add($orderDetail['orderId'],ArrayConst::logMsgType[ApiConst::sellerUpdateOrderAmount],DescribeConst::sellerLog,$memberName,$orderDetail['orderState']);

application/modules/Client/controllers/User.php

@@ -33,6 +33,8 @@ class UserController extends \Our\Controller_AbstractIndex {
             $password=$data[NameConst::password];
             $shopKeeperServvice=\Business\Store\ShopkeeperServiceModel::getInstance();
             $seller=$shopKeeperServvice->sellerLogin($sellerName);
+            $storeService =\Business\Store\StoreServiceModel::getInstance();
+
 
             if(!empty($seller)){
                 $mobile=$seller['memberMobile'];
@@ -80,7 +82,7 @@ class UserController extends \Our\Controller_AbstractIndex {
                     //通知退出
 
                     $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']));
+                    $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'],'storeLabel'=>$member['memberAvatarUrl']));
                 }else{
                     ErrorModel::throwException(CodeConfigModel::errorUsernameOrPassword);
                 }