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

application/library/JPush/ClientPush.php

@@ -64,7 +64,8 @@ class ClientPush
     }
     public function push($pushData)
     {
-        $pushFlag=(APP_ENV=='product' || APP_ENV=='productone')?true:false;
+      //  $pushFlag=(APP_ENV=='product' || APP_ENV=='productone')?true:false;
+        $pushFlag=true;
        // echo json_encode($pushData);
        $title=$this->getMessageType($pushData['fromType']);
         $messageContent=$this->getMessageContent($pushData['message']);

application/library/Our/ApiConst.php

@@ -421,6 +421,7 @@ class ApiConst
     const reachRemindMessageType = 1;
     const waitRecieveOrderType = 15;
     const deliveryOrderType = 16;
+    const reicieveOrderType = 17;
     //pcClient 消息推送消息模板类型常量
     const messageWaitReceive=101;
 //售后

application/library/Our/Common.php

@@ -278,8 +278,8 @@ class Common
         $result=trim($result);
         return $result;
     }
-    public static function getDivNum(){
-
+    public static function getDivNum($num){
+        return bcdiv($num,100,2);
     }
     public static function mutiplicative($num){
      return    intval(bcmul($num, \Our\ApiConst::oneHandred));

application/library/Our/DescribeConst.php

@@ -164,7 +164,12 @@ class DescribeConst
     //店铺有新订单
     const recieveWaitTitle='您有新的订单';
     const recieveWaitContent='您有新的订单号为{0}的订单，是否需要接单';
-
+     //用户订单被接单
+    const recieveOrderTitle='您的订单已被接单';
+    const recieveOrderContent='您有订单号为{0}的订单，已被接单';
+    //用户订单价格被修改
+    const updateOrderTitle='您的订单已被修改';
+    const updateOrderContent='您有订单号为{0}的订单，已被修改价格';
     //消息按钮成功提示信息
     const recieveOrderSuccess='接单成功';
     //消息按钮描述

application/library/Our/Push.php

@@ -234,6 +234,63 @@ class Push
         return $messageContent;
 
     }
+    public function getUpdateOrderAmountContent($orderDetail){
+        $messageContent='订单号:'.$orderDetail['orderSn']."\n";
+        $messageContent.='商品名称:';
+        foreach($orderDetail['orderGoods'] as $orderGood){
+            $messageContent.=$orderGood['goodsName'].'×'.$orderGood['goodsNum']."\n";
+        }
+        $messageContent.='支付方式:'.ArrayConst::paymentTypes[$orderDetail['paymentType']]."\n";
+        $messageContent.='付款状态:'.($orderDetail['paymentTime']>ApiConst::zero?DescribeConst::payed:DescribeConst::notPayed)."\n";
+        $messageContent.='收货地址:'.$orderDetail['reciverInfo']['address']."\n";
+        $messageContent.='收货人:'.$orderDetail['reciverInfo']['trueName']."\n";
+        $messageContent.='收货人电话:'.$orderDetail['reciverInfo']['mobPhone']."\n";
+        $messageContent.='订单金额:'.Common::getDivNum($orderDetail['goodsAmount'])."\n";
+        $messageContent.='运费:'.Common::getDivNum($orderDetail['shippingFee'])."\n";
+        $messageContent.='优惠金额:'.Common::getDivNum($orderDetail['couponAmount'])."\n";
+        $messageContent.='应付金额:'.Common::getDivNum($orderDetail['orderAmount'])."\n";
+        return $messageContent;
+
+    }
+    //用户被修改价格消息
+    public function updateOrderAmount($storeId,$orderId,$orderSn)
+    {
+        $storeDao=\DAO\StoreModel::getInstance();
+        $orderDao=\DAO\Order\OrderModel::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);
+        $amountOrder=$orderDao->getClienOrderCommon($orderDetail);
+        $orderDetail=array_merge($orderDetail,$amountOrder);
+        $toUserId=$orderDetail['buyerId'];
+        $messageContent=$this->getUpdateOrderAmountContent($orderDetail);
+        $fromAvatar=Common::getStaticFile(ImageConst::orderAvatarName, ImageConst::systemAvatar);
+        $href=Common::format(PathConst::orderId,$orderId);
+        // $buttons=$this->getComfirmRecieveButtons($orderId);
+        $message=$this->getMessageTemplate(ApiConst::reicieveOrderType,DescribeConst::updateOrderTitle,$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();
+        $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 recieveWait($storeId,$orderId,$orderSn)
     {

application/models/Business/Coupon/CouponService.php

@@ -69,7 +69,7 @@ class CouponServiceModel extends \Business\AbstractModel{
                         }
                         $temp['storeId'] = $coupon['store_id'];
                         if($temp['storeId']){
-                            $storeInfo = $storeDao->get($temp['storeId'],false);//\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeDao, 'getInfoById'),array($temp['storeId'],'store_name'),\Our\ApiConst::oneHour);
+                            $storeInfo = $storeDao->get($temp['storeId'],false,false);//\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeDao, 'getInfoById'),array($temp['storeId'],'store_name'),\Our\ApiConst::oneHour);
                             if(!$storeInfo){
                                 continue;
                             }

application/models/Business/Order/OrderService.php

@@ -493,7 +493,6 @@ class OrderServiceModel extends \Business\AbstractModel
     public function pushRecieveOrder($order){
         $push = Push::getInstance();
         $push->recieveWait($order['storeId'], $order['orderId'], $order['orderSn']);
-        $push=\Our\Push::getInstance();
         $pushData=array('storeId'=>$order['storeId'],
             'type'=>ApiConst::messageWaitReceive,
             'waitReceiveCount'=>ApiConst::one,
@@ -508,7 +507,6 @@ class OrderServiceModel extends \Business\AbstractModel
                 'm'=>'orderDetail',
                 'orderId'=>$order['orderId']));
         $push->addOneToClient($pushData);
-        $push->sendTcpMessage();
         // \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
         $push->sendTcpMessage();
         $messageService=\Business\Message\MessageServiceModel::getInstance(\Our\DbNameConst::masterDBConnectName);
@@ -715,8 +713,6 @@ class OrderServiceModel extends \Business\AbstractModel
     public function changeOrderStatus()
     {
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
-        $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
-        $orderConfirmUtilDao=OrderConfirmUtil::getInstance(DbNameConst::masterDBConnectName);
         $beginTime = file_get_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, TIMESTAMP);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP - ApiConst::orderStateWaitConfirmBeyond;
@@ -771,27 +767,7 @@ class OrderServiceModel extends \Business\AbstractModel
             }
 
             $orderIds = array_column($orders, 'orderId');
-            //更新商品库存
-            $orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
-            $storeCartsList=array();
-            $storeCarts=array();
-            $storeCarts['storeCarts']=array();
-            foreach($orderGoods as $orderGood){
-                $orderGood['type']=!empty($orderGood['goodsGroup'])? \Our\ApiConst::addBundingToCart:\Our\ApiConst::addGoodsToCart;
-                $orderGood['goodsNum']=$orderGood['goodsNum'];
-                $orderGood['goodsList']=\Our\Common::isSerialized($orderGood['goodsGroup'])?unserialize($orderGood['goodsGroup']):array();
-                array_push($storeCarts['storeCarts'],$orderGood);
-            }
-            if(!empty($storeCarts['storeCarts'])){
-                array_push($storeCartsList,$storeCarts);
-            }
-            // $orderDao->updateNotRecieveOrders(ApiConst::orderStateWaitConfirm, ApiConst::orderStateClose, 'add_time', ApiConst::orderStateWaitConfirmBeyond, $this->orderMessageField);
-            try{
-                $orderConfirmUtilDao->updateGoodsStorage($storeCartsList,\Our\ApiConst::plus);
-            }catch(\Exception $ex){
-                $orderidsStr=implode(',',array_column($orders,'orderId'));
-                echo '商品库存更新失败:'.$ex->getMessage().$ex->getCode().":".$orderidsStr;
-            }
+            $this->updateOrderGoodsStoregeByOrderIds($orderIds);
             //发送消息
             $push = Push::getInstance();
             $push->pushOrderCloseMessage($orders);
@@ -800,6 +776,32 @@ class OrderServiceModel extends \Business\AbstractModel
         file_put_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, $endTime);
     }
 
+    public function updateOrderGoodsStoregeByOrderIds($orderIds){
+        $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
+        $orderConfirmUtilDao=OrderConfirmUtil::getInstance(DbNameConst::masterDBConnectName);
+        //更新商品库存
+        $orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
+        $storeCartsList=array();
+        $storeCarts=array();
+        $storeCarts['storeCarts']=array();
+        foreach($orderGoods as $orderGood){
+            $orderGood['type']=!empty($orderGood['goodsGroup'])? \Our\ApiConst::addBundingToCart:\Our\ApiConst::addGoodsToCart;
+            $orderGood['goodsNum']=$orderGood['goodsNum'];
+            $orderGood['goodsList']=\Our\Common::isSerialized($orderGood['goodsGroup'])?unserialize($orderGood['goodsGroup']):array();
+            array_push($storeCarts['storeCarts'],$orderGood);
+        }
+        if(!empty($storeCarts['storeCarts'])){
+            array_push($storeCartsList,$storeCarts);
+        }
+        // $orderDao->updateNotRecieveOrders(ApiConst::orderStateWaitConfirm, ApiConst::orderStateClose, 'add_time', ApiConst::orderStateWaitConfirmBeyond, $this->orderMessageField);
+        try{
+            $orderConfirmUtilDao->updateGoodsStorage($storeCartsList,\Our\ApiConst::plus);
+        }catch(\Exception $ex){
+            $orderidsStr=implode(',',$orderIds);
+            echo '商品库存更新失败:'.$ex->getMessage().$ex->getCode().":".$orderidsStr;
+        }
+    }
+
     //订单任务脚本自动确认收货
     public function canformRecieveOrder()
     {
@@ -975,6 +977,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
         $orderLogDao=\DAO\Order\OrderLogModel::getInstance(DbNameConst::masterDBConnectName);
         $orderDetail=$orderDao->getByOrderId($orderId,$orderDao->getOrderDetailField());
+        $messageService=new \Business\Message\MessageServiceModel();
         $orderDetail=$orderDetail[ApiConst::arrBegin];
         $storeDao=\DAO\StoreModel::getInstance();
         if($orderDetail['storeId']!=$storeId){
@@ -985,6 +988,10 @@ class OrderServiceModel extends \Business\AbstractModel
         }
         $data['order_amount']=$newOrderAmount;
         $res=$orderDao->updateByOrderId($data,$orderId);
+        $push=\Our\Push::getInstance();
+        $push->updateOrderAmount($orderDetail['storeId'], $orderDetail['orderId'], $orderDetail['orderSn']);
+        $push->sendTcpMessage();
+        $messageService->addMessageCenterToDb();
         $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/models/Business/Order/RefundService.php

@@ -286,6 +286,8 @@ class RefundServiceModel extends \Business\AbstractModel
             if ($refund_array['seller_state'] == '2' && !$isGiveUp) {
                 $refund_array['return_type'] = '2';//退货类型:1为不用退货,2为需要退货
                 $refund_array['goods_state']=2;
+                $orderService=\Business\Order\OrderServiceModel::getInstance();
+                $orderService->updateOrderGoodsStoregeByOrderIds($return['order_id']);
             } elseif ($refund_array['seller_state'] == '3') {
 
                 $refund_array['refund_state'] = '3';//状态:1为处理中,2为待管理员处理,3为已完成
@@ -956,9 +958,13 @@ class RefundServiceModel extends \Business\AbstractModel
                     }
                 }
             } else {
+
                 $refundAmount = $orderGoods['goodsPrice']*$orderGoods['goodsNum'];
             }
             $returnData['refundAmount'] = $refundAmount - $orderInfo['refundAmount'] - $returnData['needShippingFee'] + $shippingFee;
+            if((int)$returnData['refundAmount'] <ApiConst::zero){
+                $returnData['refundAmount']=ApiConst::zero;
+            }
 //             if($orderGoods['goodsType']==ApiConst::goodsTypeFour){
 //                 //已经退款过的金额
 //                 $alreadyRefundMoney=$orderGoodsDao->getIsRefundMoney($orderGoodses,$orderGoods['promotionsId']);

application/models/Business/Store/ShopkeeperService.php

@@ -260,6 +260,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                 $type=ApiConst::messageWaitSend;
             }
             $push=\Our\Push::getInstance();
+            $push->recievedOrder($order['store_id'], $order['order_id'], $order['orderSn']);
             $pushData=array('storeId'=>$order['store_id'],
                 'type'=>ApiConst::messageWaitReceive,
                 'waitReceiveCount'=>ApiConst::reduceOne,
@@ -275,6 +276,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                     'orderId'=>$order['order_id']));
             $push->addOneToClient($pushData);
             $push->sendTcpMessage();
+            $push->addOneToClient();
            // \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$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','orderId'=>$order['orderId'])));
             $orderDao->deleteOrderCache($order['buyer_id'], $orderId, $order['store_id'], true);

application/models/Business/Store/StoreService.php

@@ -933,7 +933,7 @@ class StoreServiceModel extends \Business\AbstractModel{
         $field = 'store_id as storeId,store_name as storeName,store_label as storeLabel,store_intro as storeIntro,store_longitude,store_latitude';
         $where = ' store_id in('.implode(',',$storeIds).')';
         sort($storeIds);
-        $stores = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeDao, 'getOnlineStores'), array($where, $field), \Our\ApiConst::oneHour);
+        $stores = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeDao, 'getOnlineStores'), array($where, $field), \Our\ApiConst::oneHour,array($condition['cityCode']));
         if($stores){
             $storeList = array();
             foreach($stores as $store){

application/models/Business/User/MemberService.php

@@ -111,6 +111,13 @@ class MemberServiceModel extends \Business\AbstractModel
         return $member ? $member : false;
     }
 
+
+    public function getOneByStoreId($storeId){
+         $memberDao=\DAO\MemberModel::getInstance();
+         $member=$memberDao->getOneByStoreId($storeId);
+         return $member;
+    }
+
     /**
      * 登录业务
      *
@@ -781,6 +788,11 @@ class MemberServiceModel extends \Business\AbstractModel
                 $memberDao->db->doRollback();
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::storePhoneUpdateFailed);
             }
+            $resultStoreJoinin = \DAO\Store\StoreJoininModel::getInstance(\Our\DbNameConst::masterDBConnectName)->save(array('seller_name'=>$data['mobile']),array('member_id'=>$store['member_id']));
+            if($resultStoreJoinin===false){
+                $memberDao->db->doRollback();
+                \Error\ErrorModel::throwException(\Error\CodeConfigModel::sellerJoinUpdateFailed);
+            }
         }
         $sellerResult = \DAO\Store\SellerModel::getInstance(\Our\DbNameConst::masterDBConnectName)->update(array('seller_name'=>$data['mobile']),array('seller_name'=>$oldMemberMobile));
         if($sellerResult===false){

application/models/DAO/Goods.php

@@ -378,7 +378,7 @@ class GoodsModel extends \DAO\AbstractModel {
         $dataIds = array();
         for ($i = 0; $i < count($datas); $i++) {
             $goodsSql .= \Our\Common::format(" WHEN {0} THEN goods_storage{2}{1} ", $datas[$i]['goodsId'], $datas[$i]['goodsNum'],\Our\ArrayConst::ops[$op]);
-            $goodsEdittimeSql .= \Our\Common::format("  WHEN {0} THEN goods_edittime={1}", $datas[$i]['goodsId'],TIMESTAMP);
+            $goodsEdittimeSql .= \Our\Common::format("  WHEN {0} THEN {1}", $datas[$i]['goodsId'],TIMESTAMP);
             $dataIds[] = $datas[$i]['goodsId'];
             //$updateAllSql .= $updateSql;
             if ($i % 1000 == 0 && $i != 0) {

application/models/DAO/Member.php

@@ -27,6 +27,8 @@ class MemberModel extends \DAO\AbstractModel
   //有效用户返回数据
   private $memberColumn = array('member_id', 'member_name','member_truename', 'member_avatar', 'member_sex', 'member_birthday', 'member_mobile', 'member_mobile_bind', 'member_qq', 'member_qqopenid', 'member_qqinfo', 'member_wxinfo', 'member_wxopenid', 'member_sinaopenid', 'member_sinainfo', 'member_points', 'member_state', 'member_quicklink', 'member_exppoints', 'store_id', 'iswx', 'agree_flag', 'seller_id', 'diliveryman_id', 'member_tag_ids', 'member_group_ids', 'is_teacher', 'member_email', 'member_email_bind','is_wxsend','member_state');
 
+  public $memberDetail='member_id as memberId';
+
 
   public function init()
   {
@@ -297,6 +299,12 @@ class MemberModel extends \DAO\AbstractModel
     return $member;
   }
 
+  public function getOneByStoreId($storeId){
+    $this->setDb($this->dbName);
+    $where['store_id'] = $storeId;
+    $member = $this->getOneByWhereWithField($where,$this->memberDetail);;
+    return $member;
+  }
   /**
    * 获取类实例
    *

application/models/DAO/Order/ApiReciverInfo.php

@@ -62,7 +62,7 @@ class ApiReciverInfoModel extends \DAO\AbstractModel
         $this->cityCode=isset($reciverInfo['citycode'])?$reciverInfo['citycode']:'';
         $this->addressId=$reciverInfo['address_id'];
         $this->subAddress=isset($reciverInfo['subaddress'])?$reciverInfo['subaddress']:'';
-        $this->trueName=$reciverInfo['true_name'];
+        $this->trueName=$reciverInfo['name'];
     }
 
     public function getReceiverInfo(){

application/models/DAO/Order/RefundReturn.php

@@ -471,6 +471,9 @@ class RefundReturnModel extends \DAO\AbstractModel {
             $refund_array['commis_rate'] = $goods['commisRate'];
             $refund_array['goods_image'] = $goods['goodsImage'];
         }
+        if($refund_array['goods_id']==ApiConst::zero){
+            ErrorModel::throwException(CodeConfigModel::commonError);
+        }
         if(!isset($refund_array['refund_sn'])|| !$refund_array['refund_sn']){
             $refund_array['refund_sn'] = $this->getRefundsn($order['storeId']);
         }

application/models/DAO/Store/StoreJoinin.php

@@ -43,6 +43,14 @@ class StoreJoininModel extends \DAO\AbstractModel
     public function getOneByMemberIdCache($memberId,$field) {
         return \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$this, 'getOneByMemberId'),array($memberId,$field),\Our\ApiConst::oneDaySecond,array($memberId));
     }
+
+
+    public function save($data, $where){
+        $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        $result = $this->db->update($this->_tableName)->rows($data)->where($where)->execute();
+        return $result;
+    }
+
     /**
      * 类实例
      *

application/models/Error/CodeConfig.php

@@ -103,6 +103,7 @@ class CodeConfigModel
     const storePhoneUpdateFailed = 10115;
     const sellerNameUpdateFailed = 10116;
     const notHaveAccess = 10117;
+    const sellerJoinUpdateFailed = 10118;
     //访问错误
     const illegalAccess = 200001;
 
@@ -132,7 +133,7 @@ class CodeConfigModel
     const saveScanStoreInfoFailed = 40012;
     const storeNotOpen = 40013;
     const storeNotExistOrClose1 = 40014;
-
+    const storeIsRefuse = 40015;
     //购物车
     const wrongCartType = 50001;
     const emptyAddCartMemberId = 50002;
@@ -530,6 +531,7 @@ class CodeConfigModel
             self::storePhoneUpdateFailed => '更换手机时卖家手机号码更新失败',
             self::sellerNameUpdateFailed => '更换手机时卖家手机号码更新失败',
             self::notHaveAccess => '您没有权限使用',
+            self::sellerJoinUpdateFailed => '更换手机时卖家手机号码更新失败',
             //商品相关
             self::emptyCommonId => '商品主键不能为空',
             self::goodsNotExist => '商品不存在',
@@ -554,6 +556,7 @@ class CodeConfigModel
             self::emptyScanStoreInfo => '扫码关注店铺不存在',
             self::saveScanStoreInfoFailed => '扫码店铺保存失败',
             self::storeNotOpen => '店铺还未配置开启',
+            self::storeIsRefuse=>'您的店铺已被禁用',
             self::storeNotExistOrClose1 => '店铺不存在或者已关闭',
 
             //购物车相关

application/modules/Client/controllers/User.php

@@ -33,8 +33,17 @@ class UserController extends \Our\Controller_AbstractIndex {
             $password=$data[NameConst::password];
             $shopKeeperServvice=\Business\Store\ShopkeeperServiceModel::getInstance();
             $seller=$shopKeeperServvice->sellerLogin($sellerName);
+
+
+
             if(!empty($seller)){
                 $mobile=$seller['memberMobile'];
+                $isStore=$this->memberService->getOneByStoreId($seller['storeId']);
+                if(empty($isStore)){
+                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeIsRefuse);
+                }
+                $storeService =\Business\Store\StoreServiceModel::getInstance();
+                $storeOne=$storeService->getStoreDetail($seller);
             }else{
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::errorUsernameOrPassword);
             }
@@ -75,7 +84,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'=>$storeOne['storeLabel']));
                 }else{
                     ErrorModel::throwException(CodeConfigModel::errorUsernameOrPassword);
                 }

public/gotoshenbd.php

+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+    <link href="http://testadmin.shenbd.com/mall/templates/default/css/seller_center.css" rel="stylesheet" type="text/css"/>
+
+    <title>打印--陈传文的测试店发货单</title>
+</head>
+
+<body>
+<a href="gotoshenbd://share.shenbd.com/share.html?type=goods&gid=101612&cid=103089&sid=12">商品详情</a>
+<a href="gotoshenbd://share.shenbd.com/share.html?type=store&id=131">店铺详情</a>
+
+</body>
+
+</html>
\ No newline at end of file