商家配送逻辑修改

application/controllers/Cart.php

@@ -171,7 +171,6 @@ class CartController extends \Our\Controller_AbstractApi{
         //$this->success($storeCartData);
         if(CURRENTVERSION==\Our\NameConst::versionOne){
             $storeCartData = $cartService->getDeliveryTypeForCartNew($address,$storeCartData);
-            //$this->success($storeCartData);
             $data = $cartService->getFormatCartListForOrderNew($storeCartData,$address);
         }else{
             $storeCartData = $cartService->getDeliveryTypeForCart($address,$storeCartData);

application/models/Business/Cart/CartService.php

@@ -958,7 +958,7 @@ class CartServiceModel extends \Business\AbstractModel{
             $newStoreData['leftAmount'] = \Our\ApiConst::zero;
             $newStoreData['inServiceAreaFlag'] = \Our\ApiConst::zero;
             $newStoreData['storeAddress'] = $deliverySetting['storeAddress'];
-            if($deliverySetting['sellerDistribution']==\Our\ApiConst::one&&$deliverySetting['deliverTimeList']){
+            if($deliverySetting['sellerDistribution']==\Our\ApiConst::one){
                 $deliveryTimes = $deliverySetting['deliverTimeList'];
 
                 $newStoreData['inServiceAreaFlag'] = $deliverySetting['inServiceAreaFlag'];
@@ -966,7 +966,7 @@ class CartServiceModel extends \Business\AbstractModel{
                 $delivery = array();
                 $delivery['name'] = \Our\DescribeConst::deliveryNameStore;
                 $delivery['type'] = \Our\ApiConst::deliveryStore;
-                $deliveryFee = $deliverySetting['sellerDefaultFee'];
+                $deliveryFee = isset($deliverySetting['sellerDefaultFee'])&&$deliverySetting['sellerDefaultFee']?$deliverySetting['sellerDefaultFee']:\Our\ApiConst::zero;
                 $shippingFee = $deliveryFee;
                 $delivery['isChoosed'] = \Our\ApiConst::one;
                 $delivery['deliveryFee'] = $deliveryFee;

conf/application.ini

@@ -374,7 +374,7 @@ elastic.master.host="192.168.1.201"
 elastic.master.port="9200"
 elastic.master.scheme="http";
 
-[lyztest : common]
+[lyz : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
 resources.database.params.hostname = "127.0.0.1"
@@ -421,7 +421,7 @@ elastic.master.host="192.168.1.201"
 elastic.master.port="9200"
 elastic.master.scheme="http";
 
-[lyz : common]
+[lyztest : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
 resources.database.params.hostname = "127.0.0.1"