增加抢到的红包类型

mobile/control/member_bonus.php

@@ -194,9 +194,21 @@ class member_bonusControl extends mbMemberControl
 
         $result = array();
         $items = $mod_bonus->getBonusList($cond,'*','bonus_id desc',$this->page_size(),$count);
+
+        $type_ids = array();
+        foreach ($items as $val) {
+            array_push($type_ids,intval($val['type_id']));
+        }
+
+        $types = array();
+        $type_items = Model('bonus_type')->getTypeList(array('type_id' => array('in',$type_ids)));
+        foreach ($type_items as $val) {
+            $type = bonus\type::crate_by_paramer($val);
+            $types[$type->getType_id()] = $type;
+        }
+
         foreach($items as $val) {
             $user_bonus = bonus\user_bonus::create_by_param($val);
-
             $item = array();
             $item['bonus_sn'] = $user_bonus->bonus_sn();
             $item['bonus_value'] = $user_bonus->bonus_value();
@@ -206,9 +218,10 @@ class member_bonusControl extends mbMemberControl
             $item['spend_over'] = $user_bonus->spend_over();
             $item['get_time'] = $user_bonus->get_time();
 
-            $type = bonus\type::create_by_id($user_bonus->type_id());
+            $type = $types[$user_bonus->type_id()];
             $item['sender_name'] = $type->sender_name();
             $item['rand_type'] = $type->isRandomAmount();
+            $item['show_type'] = self::show_type($type->make_type());
 
             array_push($result,$item);
         }
@@ -216,6 +229,26 @@ class member_bonusControl extends mbMemberControl
         return self::outsuccess(array('bonuses' => $result,'mobile_page' => mobile_page($pages)));
     }
 
+    private function show_type($make_type)
+    {
+        switch ($make_type) {
+            case bonus\type::MakeSendType:
+                return 1;
+            case bonus\type::MakeBonusRefundType:
+            case bonus\type::MakePayRefundType:
+            case bonus\type::MakeOrderCancelType:
+                return 2;
+            case bonus\type::MakeShakeGainType:
+            case bonus\type::MakeShakeLostType:
+                return 3;
+            case bonus\type::MakePayType:
+            case bonus\type::MakeRegister:
+                return 4;
+            default:
+                return 0;
+        }
+    }
+
     //预存款收支记录
     public function pdlogOp()
     {