配送公式修改

application/models/DAO/Adv/GoodsClassImage.php

@@ -38,6 +38,7 @@ class GoodsClassImageModel  extends \DAO\AbstractModel{
         }
         $where['store_id'] = $storeId;
         $where['gc_id'] = $gcId;
+        $where['state'] = \Our\ApiConst::one;
         $goodsClassImage = \Our\RedisHelper::cachedFunction(\Redis\Db9\GoodsClassImageRedisModel::getInstance(),array(&$this, 'find'),array($where),\Our\ApiConst::oneHour,array($gcId.'_'.$storeId));
         return $goodsClassImage;
 

application/models/DAO/DeliveryFormula.php

@@ -36,7 +36,7 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
         if(!$deliveryFormula){
             return false;
         }
-        $deliveryFormula['state'] == 1 ? $formula = unserialize($deliveryFormula['formula']) : $formula = unserialize($deliveryFormula['simple_formula']);
+        /*$deliveryFormula['state'] == 1 ? $formula = unserialize($deliveryFormula['formula']) : $formula = unserialize($deliveryFormula['simple_formula']);
         if($deliveryFormula['state'] == 1){
             ksort($formula);
             foreach($formula as $key=>$temp){
@@ -50,6 +50,12 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
                     return $formula[$key];
                 }
             }
+        }*/
+        $formula = unserialize($deliveryFormula['simple_formula']);
+        foreach($formula as $key=>$temp){
+            if($key*1000>=$distince){
+                return $formula[$key];
+            }
         }
     }
 
@@ -60,7 +66,7 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
             return false;
         }
         $deliveryFormula['state'] == \Our\ApiConst::one ? $formula = unserialize($deliveryFormula['formula']) : $formula = unserialize($deliveryFormula['simple_formula']);
-        //$formula = unserialize($deliveryFormula['formula']);
+        $formula = unserialize($deliveryFormula['formula']);
         ksort($formula);
         foreach ($formula as $k=>$v){
             if($k*1000 >= $distance){
@@ -84,11 +90,12 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
         }
         $tommorowStartTime = $todayStartTime + \Our\ApiConst::oneDaySecond;
         $tommorowEndTime = $todayEndTime + \Our\ApiConst::oneDaySecond;
-        if($deliveryFormula['state'] == \Our\ApiConst::one) {
+        /*if($deliveryFormula['state'] == \Our\ApiConst::one) {
             $returnData = $this->getCommonFormula($choosedData,$todayStartTime,$todayEndTime,$tommorowStartTime,$tommorowEndTime,$deliveryIntval);
         }else{
             $returnData = $this->getSimpleFormula($choosedData,$todayStartTime,$todayEndTime,$tommorowStartTime,$tommorowEndTime,$deliveryIntval);
-        }
+        }*/
+        $returnData = $this->getSimpleFormula($choosedData,$todayStartTime,$todayEndTime,$tommorowStartTime,$tommorowEndTime,$deliveryIntval);
         if($deliveryFreeFlag&&$returnData){
             $aRplaceMent=array_fill(0,count($returnData),array('price'=>0));
             $returnData=array_replace_recursive($returnData,$aRplaceMent);