版本修改

application/controllers/Cart.php

@@ -116,13 +116,13 @@ class CartController extends \Our\Controller_AbstractApi{
         //var_dump($storeCartData);
         $storeCartData = $cartService->checkCouponForCart($storeCartData,$this->memberId);
         //$this->success($storeCartData);
-        if(CURRENTVERSION==\Our\NameConst::versionOne){
+        if(CURRENTVERSION==\Our\NameConst::versionDefault){
+            $storeCartData = $cartService->getDeliveryTypeForCart($address,$storeCartData);
+            $data = $cartService->getFormatCartListForOrder($storeCartData,$address);
+        }else{
             $storeCartData = $cartService->getDeliveryTypeForCartNew($address,$storeCartData,$this->memberId);
             //$this->success($storeCartData);
             $data = $cartService->getFormatCartListForOrderNew($storeCartData,$address);
-        }else{
-            $storeCartData = $cartService->getDeliveryTypeForCart($address,$storeCartData);
-            $data = $cartService->getFormatCartListForOrder($storeCartData,$address);
         }
         $this->success($data);
 
@@ -144,12 +144,12 @@ class CartController extends \Our\Controller_AbstractApi{
         $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);
-        if(CURRENTVERSION==\Our\NameConst::versionOne){
-            $storeCartData = $cartService->getDeliveryTypeForCartNew($address,$storeCartData,$this->memberId);
-            $data = $cartService->getFormatCartListForOrderNew($storeCartData,$address);
-        }else{
+        if(CURRENTVERSION==\Our\NameConst::versionDefault){
             $storeCartData = $cartService->getDeliveryTypeForCart($address,$storeCartData);
             $data = $cartService->getFormatCartListForOrder($storeCartData,$address);
+        }else{
+            $storeCartData = $cartService->getDeliveryTypeForCartNew($address,$storeCartData,$this->memberId);
+            $data = $cartService->getFormatCartListForOrderNew($storeCartData,$address);
         }
         $this->success($data);
     }

application/library/Order/OrderConfirmUtil.php

@@ -50,10 +50,10 @@ class OrderConfirmUtil {
     public  function addOrder($data,$memberId,$currentAddress){
         $storeCartData = $this->checkPostData($data,$memberId,$currentAddress);
         //return $storeCartData;
-        if(CURRENTVERSION==\Our\NameConst::versionOne){
-            $storeCartData = $this->checkDeliveryTypeAndPaywayNew($storeCartData);
-        }else{
+        if(CURRENTVERSION==\Our\NameConst::versionDefault){
             $storeCartData = $this->checkDeliveryTypeAndPayway($storeCartData);
+        }else{
+            $storeCartData = $this->checkDeliveryTypeAndPaywayNew($storeCartData);
         }
         return $this->saveOrderInfo($storeCartData);
     }
@@ -79,10 +79,10 @@ class OrderConfirmUtil {
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyParamForOrder);
         }
         if(isset($this->postData['storeId'])&&$this->postData['storeId']){//组合销售或者单品的立即购买
-            if(CURRENTVERSION==\Our\NameConst::versionOne){
-                $this->checkOneStoreDataNew($this->postData);
-            }else{
+            if(CURRENTVERSION==\Our\NameConst::versionDefault){
                 $this->checkOneStoreData($this->postData);
+            }else{
+                $this->checkOneStoreDataNew($this->postData);
             }
             if((isset($this->postData['blId'])&&$this->postData['blId']>\Our\ApiConst::zero)&&(isset($this->postData['goodsId'])&&$this->postData['goodsId']>\Our\ApiConst::zero)){
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::wrongBlIdAndGoodsIdForOrder);
@@ -101,10 +101,10 @@ class OrderConfirmUtil {
 		}else{
             $this->cartCacheDeleteFlag = true;
             foreach($this->postData as $temp){
-                if(CURRENTVERSION==\Our\NameConst::versionOne){
-                    $this->checkOneStoreDataNew($temp);
-                }else{
+                if(CURRENTVERSION==\Our\NameConst::versionDefault){
                     $this->checkOneStoreData($temp);
+                }else{
+                    $this->checkOneStoreDataNew($temp);
                 }
                 if(!$temp['cartIds']){
                     \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyCartIdsForOrder);
@@ -511,14 +511,14 @@ class OrderConfirmUtil {
             $order['store_name'] = $storeCarts['storeName'];
             $order['buyer_id'] = $this->memberId;
             $order['buyer_name'] = $this->member['memberName'];
-            if(CURRENTVERSION==\Our\NameConst::versionOne){
+            if(CURRENTVERSION==\Our\NameConst::versionDefault){
+                $order['buyer_email'] = $this->member['memberEmail'];
+            }else{
                 if($storeCarts['delivery']['deliveryType'] == \Our\ApiConst::deliveryBuyer){
                     $order['buyer_email'] = $storeCarts['delivery']['buyerMobile'];
                 }else{
                     $order['buyer_email'] = $this->address['mob_phone'];
                 }
-            }else{
-                $order['buyer_email'] = $this->member['memberEmail'];
             }
             $order['add_time'] = TIMESTAMP;
             $order['payment_type'] = $storeCarts['payway'];
@@ -854,7 +854,6 @@ class OrderConfirmUtil {
 
             $cartRedis = \Redis\Db7\CartRedisModel::getInstance();
             $memberCartKey = \Our\NameConst::memberStoreCartsPrefix.'*_'.$storeId;
-            \Our\Log::getInstance()->write(json_encode($cartRedis->tableKeys($memberCartKey)),'/data/log/apptest');
             $cartRedis->tableDelAll($cartRedis->tableKeys($memberCartKey));
         }
         $this->updateGoodsStorageToDBAndCache($goodsCommonIds,$goodsIds,$blIds,$goodsNewList,$op,$updateSaleNumFlag);

application/library/Payment/Pay.php

@@ -27,7 +27,7 @@ class Pay {
         $this->member = \DAO\MemberModel::getInstance()->getInfo($this->memberId);
         $return = array();
         $wxFlag = false;
-        if(CURRENTVERSION==\Our\NameConst::versionOne&&($data['channel']==\Our\NameConst::wxAppChannel||$data['channel']==\Our\NameConst::wxLiteChannel)){
+        if(CURRENTVERSION!=\Our\NameConst::versionDefault&&($data['channel']==\Our\NameConst::wxAppChannel||$data['channel']==\Our\NameConst::wxLiteChannel)){
             $wxFlag = true;
         }
         $orderInfo = $this->getOrder($wxFlag);