From 47a386473c009ae8fbe1c7ddeeee307d2e9682a3 Mon Sep 17 00:00:00 2001
From: Terry <2358269014@qq.com>
Date: Wed, 28 Feb 2018 11:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=B0=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/appfront/theme/base/front/assets/js/js.js   |  2 +-
 .../theme/base/front/catalog/category/index.php |  3 +++
 services/cart/Quote.php                         |  2 +-
 services/cart/QuoteItem.php                     |  3 ---
 services/product/Price.php                      | 17 +++++++++++++----
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/appfront/theme/base/front/assets/js/js.js b/app/appfront/theme/base/front/assets/js/js.js
index 84d516e8..cabd499e 100644
--- a/app/appfront/theme/base/front/assets/js/js.js
+++ b/app/appfront/theme/base/front/assets/js/js.js
@@ -39,7 +39,7 @@ $(document).ready(function(){
 			logoutStr = $('.logoutStr').val();
 			if(data.loginStatus){
 				customer_name = data.customer_name;
-				str = '<span id="welcome">'+welcome+' '+customer_name+',</span>';
+				str = '<span id="welcome">'+welcome+' '+customer_name+'</span>';
 				str += '<span id="js_isNotLogin">';
 				str += '<a href="'+logoutUrl+'" rel="nofollow">'+logoutStr+'</a>';
 				str += '</span>';
diff --git a/app/appfront/theme/base/front/catalog/category/index.php b/app/appfront/theme/base/front/catalog/category/index.php
index 204dfb9b..dc325b9b 100644
--- a/app/appfront/theme/base/front/catalog/category/index.php
+++ b/app/appfront/theme/base/front/catalog/category/index.php
@@ -42,6 +42,9 @@
 						<ul>
 						<?php  endif; ?>
 							<li>
+                                <div style="display:none">
+                                    <?= $currentOff = Yii::$service->product->price->currentOff; // 通过这个函数也可以得到特价折扣值  OFF ?>
+                                </div>
 								<div class="c_img">
 									<a href="<?= $product['url'] ?>">
 										<img class="js_lazy" src="<?= Yii::$service->image->getImgUrl('images/lazyload.gif');   ?>" data-original="<?= Yii::$service->product->image->getResize($product['image'],[230,230],false) ?>"  />
diff --git a/services/cart/Quote.php b/services/cart/Quote.php
index 9dab7a6f..6db3a5a9 100644
--- a/services/cart/Quote.php
+++ b/services/cart/Quote.php
@@ -217,7 +217,7 @@ class Quote extends Service
     protected function actionClearCart()
     {
         //Yii::$service->session->remove(self::SESSION_CART_ID);
-        Yii::$service->cart->quoteItem->removeNoActiveItems();
+        Yii::$service->cart->quoteItem->removeNoActiveItemsByCartId();
     }
 
     /**
diff --git a/services/cart/QuoteItem.php b/services/cart/QuoteItem.php
index b6c6dfc4..43b3c24d 100644
--- a/services/cart/QuoteItem.php
+++ b/services/cart/QuoteItem.php
@@ -418,7 +418,6 @@ class QuoteItem extends Service
                 $active = $this->activeStatus;
             }
             $updateCount = $this->_itemModel->updateAll(
-                
                 ['active'  => $active],
                 ['cart_id' => $cart_id]
             ); 
@@ -444,8 +443,6 @@ class QuoteItem extends Service
         if (!$cart_id) {
             $cart_id = Yii::$service->cart->quote->getCartId();
         }
-        echo 2;
-        echo $cart_id;
         if ($cart_id) {
             $columns = $this->_itemModel->deleteAll([
                 'cart_id' => $cart_id,
diff --git a/services/product/Price.php b/services/product/Price.php
index 0de1ed51..e168df1d 100644
--- a/services/product/Price.php
+++ b/services/product/Price.php
@@ -27,7 +27,11 @@ class Price extends Service
     public $ifSpecialPriceGtPriceFinalPriceEqPrice;
 
     protected $_currencyInfo;
-
+    
+    // 执行函数 getCurrentCurrencyProductPriceInfo，会将折扣数保存到 currentOff 中，
+    // 您可以通过 Yii::$service->product->price->currentOff 直接获取。
+    public $currentOff = 0;
+    
     /**
      * @property  $price 		 | Float  产品的价格
      * 得到当前货币状态下的产品的价格信息。
@@ -268,6 +272,7 @@ class Price extends Service
      */
     protected function actionGetCurrentCurrencyProductPriceInfo($price, $special_price, $special_from, $special_to)
     {
+        $this->currentOff = 0;
         $price_info = $this->formatPrice($price);
         $return['price'] = [
             'symbol'    => $price_info['symbol'],
@@ -278,12 +283,16 @@ class Price extends Service
         if ($specialIsActive) {
             $special_price_info = Yii::$service->product->price->formatPrice($special_price);
             $return['special_price'] = [
-                'symbol'    => $special_price_info['symbol'],
-                'value'    => $special_price_info['value'],
-                'code'        => $special_price_info['code'],
+                'symbol'        => $special_price_info['symbol'],
+                'value'         => $special_price_info['value'],
+                'code'          => $special_price_info['code'],
             ];
+            $off = ($price_info['value'] - $special_price_info['value'] ) / $price_info['value'];
+            $this->currentOff = round($off * 100);
         }
 
         return $return;
     }
+    
+    
 }
-- 
GitLab