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

application/models/Business/Common/SettingService.php

@@ -9,8 +9,8 @@ class SettingServiceModel extends \Business\AbstractModel{
         $settingDAO = \DAO\SettingModel::getInstance();
         $type == 0 ? $version = $settingDAO->getListCache(array('android_version','android_apk')) : $version = $settingDAO->getListCache(array('ios_version'));
         if($version['android_version']) {
-            $host = 'http://testadmin.shenbd.com';
-            return array('version'=>$version['android_version'],'url'=>$host . '/mall/index.php?act=desc&op=upload&file_name='.$version['android_apk']);
+            $url = \Our\Common::getStaticFile($version['android_apk'],'apk/');
+            return array('version'=>$version['android_version'],'url'=>$url);
         }
         return array('version'=>$version['ios_version']);
     }

application/models/DAO/DeliveryFormula.php

@@ -86,7 +86,6 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
         $tommorowEndTime = $todayEndTime + \Our\ApiConst::oneDaySecond;
         if($deliveryFormula['state'] == \Our\ApiConst::one) {
             $returnData = $this->getCommonFormula($choosedData,$todayStartTime,$todayEndTime,$tommorowStartTime,$tommorowEndTime,$deliveryIntval);
-            $returnData = $this->getCommonFormula($choosedData,$todayStartTime,$todayEndTime,$tommorowStartTime,$tommorowEndTime,$deliveryIntval);
         }else{
             $returnData = $this->getSimpleFormula($choosedData,$todayStartTime,$todayEndTime,$tommorowStartTime,$tommorowEndTime,$deliveryIntval);
         }
@@ -155,8 +154,16 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
             if($expriseData){
                 $returnData = array_merge($expriseData,$returnData);
             }
+        }
+        if($returnData){
             $returnData = array_merge($returnData,$tommorowData);
+        }else{
+            $returnData = $tommorowData;
+        }
+        foreach($returnData as $key => $delivery){
+            $time[$key] = $delivery['time'];
         }
+        array_multisort($time, SORT_ASC, $returnData);
         return $returnData;
     }
 
@@ -237,6 +244,10 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
             }
         }
         $returnData = array_merge($returnData,$tommorowData);
+        foreach($returnData as $key => $delivery){
+            $time[$key] = $delivery['time'];
+        }
+        array_multisort($time, SORT_ASC, $returnData);
         return $returnData;
     }
 

application/models/Error/CodeConfig.php

@@ -701,7 +701,7 @@ class CodeConfigModel {
             self::noStoreDeliveryTypeForOrder => '该店铺未配置商家配送',
             self::wrongStoreDeliveryFeeForOrder => '店铺配送费参数错误',
             self::wrongDeliveryTimeRangeForOrder => '下单时配送时间格式',
-            self::noBuyerDeliveryTypeForOrder => '该店铺配置到店自提',
+            self::noBuyerDeliveryTypeForOrder => '该店铺未配置到店自提',
             self::noDeliveryFeeForBuyerType => '到店自提不收取配送费',
             self::noExpressDeliveryForOrder => '该店铺未配置快递配送',
             self::wrongPaywayForStoreForOrder => '店铺暂未配置您选择的支付方式',