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

application/controllers/Store.php

@@ -89,7 +89,8 @@ class StoreController extends \Our\Controller_AbstractIndex {
         $pageSize = $this->getPageSize(\Our\PageConst::pBlPage);
         $data['pageIndex'] = $pageIndex;
         $data['pageSize'] = $pageSize;
-        $info = \Business\Goods\GroupSaleServiceModel::getInstance()->getGroupSaleGoodsList($data);
+        $currentAddress = $this->sess->get('currentAddress');
+        $info = \Business\Goods\GroupSaleServiceModel::getInstance()->getGroupSaleGoodsList($data,$currentAddress);
         $this->success($info);
     }
 

application/models/Business/Goods/GroupSaleService.php

@@ -429,11 +429,17 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
      * @throws \Exception
      * @throws \Our\Exception
      */
-    public function getGroupSaleGoodsList($param){
+    public function getGroupSaleGoodsList($param,$address = array()){
         $storeId = (int)$param['storeId'];
         if(!$storeId){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyStoreId);
         }
+        if(!$address){
+            $inServiceAreaFlag = \Our\ApiConst::one;
+        }else{
+            $inAreaFlag = \Store\StoreUtil::getInstance()->checkAddressInServiceArea($address,$storeId);
+            $inServiceAreaFlag = $inAreaFlag?\Our\ApiConst::one:\Our\ApiConst::zero;
+        }
         $pageSize = (int)$param['pageSize'];
         $pageIndex = (int)$param['pageIndex'];
         if($pageSize === 0){
@@ -488,7 +494,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
         }else{
             $totalCount = 0;
         }
-        return array('totalCount'=>$totalCount,'groupGoods'=>array_values($group));
+        return array('totalCount'=>$totalCount,'groupGoods'=>array_values($group),'inServiceAreaFlag'=>$inServiceAreaFlag);
     }
 
     public function getPBundlingList($groupList,$dbName = \Our\DbNameConst::salveDBConnectName,$withKeyFlag = false){

application/models/Business/Order/OrderService.php

@@ -297,6 +297,8 @@ class OrderServiceModel extends \Business\AbstractModel
         $returnData['offlinePayway'] = $this->store['offlinePayway'] ? $this->store['offlinePayway'] : '';
         $this->address['address']=$orderCommonDao->convertReceiveAddress($this->address['address']);
         $returnData['reciverInfo'] = $this->address;
+        $returnData['reciverInfo']['mobPhone']=!empty($returnData['reciverInfo']['mobPhone'])?$returnData['reciverInfo']['mobPhone']:'';
+        $returnData['reciverInfo']['telPhone']=!empty($returnData['reciverInfo']['telPhone'])?$returnData['reciverInfo']['telPhone']:'';
         $returnData['reciverInfo']['lng']=!empty($returnData['reciverInfo']['lng'])?$returnData['reciverInfo']['lng']:ApiConst::zero;
         $returnData['reciverInfo']['lat']=!empty($returnData['reciverInfo']['lat'])?$returnData['reciverInfo']['lat']:ApiConst::zero;
         $refundStateName = $orderDao->getRefundText($this->order);
@@ -927,6 +929,7 @@ class OrderServiceModel extends \Business\AbstractModel
         //收货人信息
         $this->orderCommon = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($orderId, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond);
         $reciverInfo = unserialize($this->orderCommon['reciverInfo']);
+
         //定单商品表
         $this->orderGoodsList = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderId, $this->getGoodsDetailField()), \Our\ApiConst::oneDaySecond);
         if (empty($this->orderGoodsList)) {
@@ -1016,6 +1019,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $dlyoPickupCode = \Our\NameConst::emptyString;
         foreach ($orderList as $order) {
             $orderNos[] = $order['order_sn'];
+            $dlyoPickupCode = substr($order['order_sn'], ApiConst::positionPickupCodeBegin);
             if ($order['order_state'] == \Our\ApiConst::orderStateWaitPay) {
                 $orderTips = \Our\DescribeConst::payFailedTips;
                 $orderSubTips = \Our\DescribeConst::payFailedSubTips;
@@ -1044,7 +1048,6 @@ class OrderServiceModel extends \Business\AbstractModel
                     $orderContent['payway'] = \Our\DescribeConst::afterPay;
                 }
                 $orderContent['orderAmount'] = $order['order_amount'];
-                $dlyoPickupCode = substr($order['order_sn'], ApiConst::positionPickupCodeBegin);
                 $orderContents[]=$orderContent;
             }
             $orderIds[] = $order['order_id'];

application/models/DAO/DeliveryFormula.php

@@ -82,8 +82,7 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
             $currentTime = $todayStartTime;
         }
         $return=array();
-        $time = date('Y-m-d',$currentTime);
-        $todayUnixTime = strtotime($time);
+        $todayUnixTime = mktime(0,0,0,date('m'),date('d'),date('Y'));
         $todayList = $this->getBuyerFormulaList($currentTime,$todayEndTime,\Our\ApiConst::one);
         $isDefault = \Our\ApiConst::zero;
         if($todayList){
@@ -103,16 +102,26 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
         }
         $nextStartTime = $todayStartTime + \Our\ApiConst::oneDaySecond*2;
         $nextEndTime = $todayEndTime + \Our\ApiConst::oneDaySecond*2;
-        if($nextEndTime>$todayUnixTime*3){
-            $nextEndTime = $todayUnixTime*3;
+        if($nextEndTime>($todayUnixTime+\Our\ApiConst::oneDaySecond*3)){
+            $nextEndTime = ($todayUnixTime+\Our\ApiConst::oneDaySecond*3);
         }
+
         $nextList = $this->getBuyerFormulaList($nextStartTime,$nextEndTime,$isDefault);
         if($nextList){
             $return = array_merge($return,$nextList);
         }
         if($return){
+            $newReturn = array();
+            foreach($return as $val){
+                $keyTemp= strtotime(date('Y-m-d',$val[0]['time']));
+                if(isset($newReturn[$keyTemp])){
+                    $newReturn[$keyTemp] = array_merge($newReturn[$keyTemp],$val);
+                }else{
+                    $newReturn[$keyTemp]=$val;
+                }
+            }
             $returnList = array();
-            foreach($return as $key=>$value){
+            foreach($newReturn as $key=>$value){
                 $dayList = array();
                 $dayList['time']= strtotime(date('Y-m-d',$value[0]['time']));
                 $dayList['list']= $value;
@@ -216,7 +225,9 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
                 $tenMinute =15;
                 $forthMinute = 45;
             }
-            if($currentMinute>$tenMinute&&$currentMinute<30){
+            if($currentMinute<=$tenMinute){
+                $currentTime = mktime(date('H',$currentTime),0,0,date('m',$currentTime),date('d',$currentTime),date('Y',$currentTime));
+            }else if($currentMinute>$tenMinute&&$currentMinute<=$forthMinute){
                 $currentTime = mktime(date('H',$currentTime),30,0,date('m',$currentTime),date('d',$currentTime),date('Y',$currentTime));
             }else if($currentMinute>$forthMinute){
                 $currentTime = mktime(date('H',$currentTime),60,0,date('m',$currentTime),date('d',$currentTime),date('Y',$currentTime));
@@ -270,8 +281,17 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
             $return = array_merge($return,$nextList);
         }
         if($return){
+            $newReturn = array();
+            foreach($return as $val){
+                $keyTemp= strtotime(date('Y-m-d',$val[0]['time']));
+                if(isset($newReturn[$keyTemp])){
+                    $newReturn[$keyTemp] = array_merge($newReturn[$keyTemp],$val);
+                }else{
+                    $newReturn[$keyTemp]=$val;
+                }
+            }
             $returnList = array();
-            foreach($return as $key=>$value){
+            foreach($newReturn as $key=>$value){
                 $dayList = array();
                 $dayList['time']= strtotime(date('Y-m-d',$value[0]['time']));
                 $dayList['list']= $value;
@@ -367,7 +387,7 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
         if($initMinute==0||$initMinute==30){
             $startTime = $beginTime;
         }else{
-            if($initMinute<30){
+            if($initMinute<10){
                 $startTime = mktime(date('H',$beginTime),30,0,date('m',$beginTime),date('d',$beginTime),date('Y',$beginTime));
             }else if($initMinute<60){
                 $startTime = mktime(date('H',$beginTime),60,0,date('m',$beginTime),date('d',$beginTime),date('Y',$beginTime));