merge code

helper/model/goods_summary.php

@@ -78,6 +78,7 @@ class goods_summary
     {
         $summary = [];
 
+        $is_virtual = boolval($this->goods_info['is_virtual']);
         $summary['goods_id'] = intval($this->goods_info['goods_id']);
         $summary['goods_commonid'] = intval($this->goods_info['goods_commonid']);
 
@@ -167,7 +168,11 @@ class goods_summary
         global $config;
         if($act_id == false)
         {
-            $summary['bonus_price']  = predeposit_helper::login_bonus_price($this->goods_info['goods_price'],$rates);
+            if($is_virtual) {
+                $summary['bonus_price']  = $this->goods_info['goods_price'];
+            } else {
+                $summary['bonus_price']  = predeposit_helper::login_bonus_price($this->goods_info['goods_price'],$rates);
+            }
             $gap = predeposit_helper::discount_gap($summary['bonus_price'],$this->goods_info['goods_price']);
             $summary['discount_gap'] = $gap;
             $summary['gap_show'] = true;
@@ -187,7 +192,11 @@ class goods_summary
         $summary['favored']  = $favorate->favored_goods($this->goods_id);
         $summary['anoticed'] = $anotice->noticed($this->goods_id);
 
-        $op_info = activity_helper::take_part_opgoods($this->goods_id);
+        if($is_virtual) {
+            $op_info = false;
+        } else {
+            $op_info = activity_helper::take_part_opgoods($this->goods_id);
+        }
         if($op_info != false) {
             $summary['is_opgoods'] = true;
             $spid = $op_info['special_id'];