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

application/models/Business/Order/OrderService.php

@@ -276,7 +276,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $returnData['shippingName'] = $orderDao->getShippingName($returnData['shippingType']);
         $returnData['orderMessage'] = $this->orderCommon['orderMessage'];
         $returnData['shippingFeeName'] = $orderDao->getFreightFeeName($returnData['shippingType']);
-        $returnData['dlyoPickupCode'] = intval(substr($returnData['orderSn'], ApiConst::positionPickupCodeBegin));
+        $returnData['dlyoPickupCode'] = substr($returnData['orderSn'], ApiConst::positionPickupCodeBegin);
         $returnData['paymentName'] = $orderDao->getPayTypeName($returnData['paymentType']);
         $returnData['discountAmount'] = $returnData['goodsAmount'] - $returnData['orderAmount'] + $returnData['shippingFee'];
         $returnData['orderText'] = $orderDao->getStatusDetailText($this->order);

application/models/Business/Order/RefundService.php

@@ -451,7 +451,7 @@ class RefundServiceModel extends \Business\AbstractModel
 //                $value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount'];
                 // $value['orderAmount'] = $value['orderAmount'];
                 $value['reciverInfo'] = unserialize($orderCommons['reciverInfo']);
-                $value['dlyoPickupCode'] = intval(substr($value['orderSn'], ApiConst::positionPickupCodeBegin));
+                $value['dlyoPickupCode'] = substr($value['orderSn'], ApiConst::positionPickupCodeBegin);
                 $value['deliveryTimeEnd'] = $value['deliveryTime'] + ApiConst::arriveTimeRadius;
                 $value['goodsImage'] = ImageUtil::getGoodsImgUrl($value['goodsImage'], ApiConst::goodsSmallSize);
                 $value['goodsAttr']=$goodsDao->getFormatGoodsAttr($value['goodsSpec']);

application/models/Business/Store/ShopkeeperService.php

@@ -312,7 +312,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['dlyoPickupCode'] = substr($value['orderSn'], ApiConst::positionPickupCodeBegin);
                         $value['deliveryTimeEnd'] = $value['deliveryTime'] + ApiConst::arriveTimeRadius;
                         if ($value['diliverymanId']) {
                             $diliverymanDao = DiliverymanModel::getInstance();
@@ -502,7 +502,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
             $returnData['couponAmount'] = ($returnData['goodsAmount'] + $returnData['shippingFee']) - $returnData['orderAmount'];//优惠券金额
             $returnData['receiveAmount'] = $returnData['goodsAmount'] - $returnData['couponAmount'];
             $returnData['orderAmount'] = $returnData['orderAmount'] + $returnData['couponAmount'];
-            $returnData['dlyoPickupCode'] = intval(substr($returnData['orderSn'], ApiConst::positionPickupCodeBegin));
+            $returnData['dlyoPickupCode'] = substr($returnData['orderSn'], ApiConst::positionPickupCodeBegin);
             $returnData['deliveryTimeEnd'] = $returnData['deliveryTime'] + ApiConst::arriveTimeRadius;
         } else {
             unset($returnData['reciverInfo']);