订单满起送和订单免服务费

application/controllers/Cart.php

@@ -138,6 +138,7 @@ class CartController extends \Our\Controller_AbstractApi{
         $gcIds = isset($cartList['gcIds'])?$cartList['gcIds']:array();
         $storeCartData = array('cartList'=>$cartList['list'],'storeIds'=>array_keys($cartList['list']),'goodsIds'=>$cartList['goodsIds'],'goodsCommonIds'=>$cartList['goodsCommonIds'],'blIds'=>$cartList['blIds'],'gcIds'=>$gcIds);
         $storeCartData = $cartService->checkCouponForCart($storeCartData,$this->memberId);
+        //$this->success($storeCartData);
         $storeCartData = $cartService->getDeliveryTypeForCart($address,$storeCartData);
         $data = $cartService->getFormatCartListForOrder($storeCartData,$address);
         $this->success($data);

application/models/Business/Cart/CartService.php

@@ -597,21 +597,29 @@ class CartServiceModel extends \Business\AbstractModel{
             $deliverySetting['buyerDistribution'] = $store['buyer_distribution'];
             $deliverySetting['sellerDistribution'] = $store['seller_distribution'];
             if($deliverySetting['sellerDistribution']&&$address){
-                $str = str_replace('\"','"',$store['store_sales_scope']);
-                $store_sales_scope = json_decode($str,true);
-                $result = \Our\CommonExtension::isPointInPolygon($store_sales_scope, array('lng'=>$address['lng'],'lat'=>$address['lat']));
-                $storeDistance = \Our\CommonExtension::getDistance($address['lat'],$address['lng'],$store['store_latitude'],$store['store_longitude'],\Our\ApiConst::one);
-
-                if($result){
-                    $deliverTimeList = $deliveryFormulaDao->getDeliveryFormulaForCart($store,$storeDistance,$storeCarts['deliveryFreeFlag']);
-                    if($deliverTimeList){
-                        $deliverySetting['deliverTimeList'] =$deliverTimeList;
-                        $storeCartData['cartList'][$storeId]['storeDistance'] = $storeDistance;
+                if((isset($store['start_shipping_price'])&&$store['start_shipping_price']>\Our\ApiConst::zero)&&$storeCarts['storeTotalPrice']<$store['start_shipping_price']){
+                    $deliverySetting['sellerDistribution'] = \Our\ApiConst::zero;
+                }else{
+                    $deliveryFreeFlag = $storeCarts['deliveryFreeFlag'];
+                    if((isset($store['free_shipping_price'])&&$store['free_shipping_price']>\Our\ApiConst::zero)&&$storeCarts['storeTotalPrice']>=$store['free_shipping_price']){
+                        $deliveryFreeFlag = \Our\ApiConst::one;
+                    }
+                    $str = str_replace('\"','"',$store['store_sales_scope']);
+                    $store_sales_scope = json_decode($str,true);
+                    $result = \Our\CommonExtension::isPointInPolygon($store_sales_scope, array('lng'=>$address['lng'],'lat'=>$address['lat']));
+                    $storeDistance = \Our\CommonExtension::getDistance($address['lat'],$address['lng'],$store['store_latitude'],$store['store_longitude'],\Our\ApiConst::one);
+
+                    if($result){
+                        $deliverTimeList = $deliveryFormulaDao->getDeliveryFormulaForCart($store,$storeDistance,$deliveryFreeFlag);
+                        if($deliverTimeList){
+                            $deliverySetting['deliverTimeList'] =$deliverTimeList;
+                            $storeCartData['cartList'][$storeId]['storeDistance'] = $storeDistance;
+                        }else{
+                            $deliverySetting['sellerDistribution'] = \Our\ApiConst::zero;
+                        }
                     }else{
                         $deliverySetting['sellerDistribution'] = \Our\ApiConst::zero;
                     }
-                }else{
-                    $deliverySetting['sellerDistribution'] = \Our\ApiConst::zero;
                 }
             }else{
                 $deliverySetting['sellerDistribution'] = \Our\ApiConst::zero;

application/models/Business/Goods/GroupSaleService.php

@@ -948,7 +948,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
             $tempObj['goodsAttr'] = $goodsDao->getFormatGoodsAttr($goods['goods_spec']);
         }
 
-        $store = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeDao, 'getInfoById'),array($storeId,\Our\NameConst::allField,false,\Our\DbNameConst::salveDBConnectName),\Our\ApiConst::oneHour);
+        $store = $storeDao->get($storeId,false);
         $tempObj['goodsMid'] = $store['member_id'];
         $storeCarts[] = $tempObj;
         $temp['goodsFreight'] = $goodsFreight;