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

application/models/Business/Store/ShopkeeperService.php

@@ -311,6 +311,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
 
                        // $value['orderAmount'] = $value['orderAmount'];
                         $value['reciverInfo'] = unserialize($value['reciverInfo']);
+                        $value['reciverInfo']  =$orderCommonDao->getReciverInfo( $value['reciverInfo'] );
                         $value['dlyoPickupCode'] = intval(substr($value['orderSn'], ApiConst::positionPickupCodeBegin));
                         $value['deliveryTimeEnd'] = $value['deliveryTime'] + ApiConst::arriveTimeRadius;
                         if ($value['diliverymanId']) {