Kirin 2 سال پیش
والد
کامیت
e4b764303d
2فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 1 1
      app/admin/controller/store/Placeorder.php
  2. 1 1
      app/models/store/StoreCart.php

+ 1 - 1
app/admin/controller/store/Placeorder.php

@@ -120,7 +120,7 @@ class Placeorder extends AuthController
         }
         if ($info) {
             $product = \app\admin\model\store\StoreProduct::get($info['product_id']);
-            $discounts = json_decode($product['time_area_discount'], true);
+            $discounts = json_decode($product['time_area_discount'] ?: '[]', true);
             $discount = 0;
             if (count($discounts) > 0) {
                 foreach ($discounts as $kk => $v) {

+ 1 - 1
app/models/store/StoreCart.php

@@ -267,7 +267,7 @@ class StoreCart extends BaseModel
                             $cart['truePrice'] = (float)StoreProduct::setLevelPrice($attrInfo['price'], $uid, true);
                             $cart['vip_truePrice'] = (float)StoreProduct::setLevelPrice($attrInfo['price'], $uid);
 
-                            $discounts = json_decode($product['time_area_discount'], true);
+                            $discounts = json_decode($product['time_area_discount'] ?: '[]', true);
                             $discount = 0;
                             if (count($discounts) > 0) {
                                 foreach ($discounts as $kk => $v) {