stanley-king 8 rokov pred
rodič
commit
9013d3368a

+ 3 - 0
helper/bonus/type.php

@@ -297,6 +297,9 @@ class type
     public function getTotal_num() {
         return $this->mParam['total_num'];
     }
+    public function fixed_money() {
+        return $this->mParam['fixed_money'];
+    }
     public function getTotal_amount() {
         return $this->mParam['total_amount'];
     }

+ 6 - 1
mobile/control/member_bonus.php

@@ -84,7 +84,12 @@ class member_bonusControl extends mbMemberControl
         }
 
         $rate_moneys = [];
-        $item['amount'] = $type->getTotal_amount();
+
+        if($type->isFixedAmount()) {
+            $item['amount'] = $type->fixed_money();
+        } else {
+            $item['amount'] = $type->getTotal_amount();
+        }
         $item['num'] = $type->getTotal_num();
         $item['rate'] = $bonus_rate;
         $rate_moneys[] = $item;

+ 0 - 1
mobile/control/member_invoice.php

@@ -122,5 +122,4 @@ class member_invoiceControl extends mbMemberControl
         );
         return self::outsuccess(array('invoice_content_list' => $invoice_content_list));
     }
-
 }