wesmiler 3 лет назад
Родитель
Сommit
61905d4cdc

+ 7 - 0
source/application/api/controller/Goods.php

@@ -50,12 +50,19 @@ class Goods extends Controller
         }
         // 分类处理,是否升级产品
         $goods['is_upgrade'] = 0;
+        $goods['user_level'] = 0;
         if($goods['category_id'] == '10001'){
             $goods['is_upgrade'] = 1;
+
+            $userInfo = $this->getUser();
+            $grade = isset($userInfo['grade'])? $userInfo['grade'] : [];
+            $gradeLevel = isset($grade['weight'])? $grade['weight'] : 0;
+            $goods['user_level'] = $gradeLevel;
         }
 
         // 多规格商品sku信息, todo: 已废弃 v1.1.25
         $specData = $goods['spec_type'] == 20 ? $model->getManySpecData($goods['spec_rel'], $goods['sku']) : null;
+
         return $this->renderSuccess([
             // 商品详情
             'detail' => $goods,

+ 2 - 2
source/application/api/service/order/Checkout.php

@@ -429,10 +429,10 @@ class Checkout
         // 商品总价 - 优惠抵扣
         foreach ($this->goodsList as &$goods) {
             // 减去优惠券抵扣金额
-            $value = helper::bcsub($goods['total_price'], $goods['coupon_money']);
+            $value = helper::bcsub($goods['total_price'], $goods['coupon_money'],6);
             // 减去积分抵扣金额
             if ($this->orderData['is_allow_points'] && $this->orderData['is_use_points']) {
-                $value = helper::bcsub($value, $goods['points_money']);
+                $value = helper::bcsub($value, $goods['points_money'],6);
             }
             $goods['total_pay_price'] = helper::number2($value);
         }