完善红包明细信息

helper/account_helper.php

@@ -53,7 +53,7 @@ class account_helper
             $to_minfo = new member_info($to_id);
             $thief =$to_minfo->nickname();
             $predo = new predeposit_helper($from_id);
-            $predo->handout_bonus($amount,$ret['type_sn'],$minfo->nickname(),"{$thief}摇走了您{$amount}元的红包.",\bonus\type::MakeShakeGainType);
+            $predo->handout_bonus($amount,$ret['type_sn'],$thief,"{$thief}摇走了您{$amount}元的红包.",\bonus\type::MakeShakeGainType);
             bonus_helper::withold($from_id,$amount);
 
             $bonusex = bonus_helper::send($ret['type_sn'],array($to_id));
@@ -87,8 +87,9 @@ class account_helper
         $ret = bonus_helper::make_bonus($param);
         if($ret != false)
         {
+            $to_info = new member_info($to_id);
             $predo = new predeposit_helper($from_id);
-            $predo->handout_bonus($amount,$ret['type_sn'],$minfo->nickname(),"您摇丢了{$amount}的红包.",\bonus\type::MakeShakeLostType);
+            $predo->handout_bonus($amount,$ret['type_sn'],$to_info->nickname(),"您摇丢了{$amount}的红包.",\bonus\type::MakeShakeLostType);
             bonus_helper::withold($from_id,$amount);
             $bonusex = bonus_helper::send($ret['type_sn'],array($to_id));
 

helper/bonus/type.php

@@ -197,28 +197,6 @@ class type
         $make_type = intval($this->mParam['make_type']);
         return $make_type;
     }
-//
-//    public function make_desc($is_sender)
-//    {
-//        $make_type = $this->make_type();
-//        if($is_sender)
-//        {
-//            switch ($make_type) {
-//                case self::MakeSendType: return "发出红包";
-//                case self::MakeBonusRefundType: return
-//            case self::MakeShakeGainType:
-//            case self::MakeShakeLostType:
-//            case self::MakePayRefundType:
-//            case self::MakePayType:
-//            case self::MakeOrderCancelType:
-//        }
-//
-//        }
-//        else
-//        {
-//
-//        }
-//    }
     public function remain_amount()
     {
         $amount = intval($this->mParam['remain_amount'] * 100 + 0.5);

helper/predeposit_helper.php

@@ -101,6 +101,12 @@ class predeposit_helper
         $data['lg_desc'] = $info;
         $this->model_pd->changePd("bonus_add_money", $data);
     }
+
+    private function gen_info(bonus\type $type)
+    {
+        $sender = $type->sender_name();
+        $make_type = $type->make_type();
+    }
     
     public function add_bonus(bonus\user_bonus $bonus,bonus\type $type)
     {
@@ -113,7 +119,7 @@ class predeposit_helper
         $data['order_sn'] = $bonus->bonus_sn();
         $data['admin_name'] = $type->sender_name();
         $data['pdr_sn'] = $bonus->bonus_sn();
-        $data['lg_desc'] = $info;
+        $data['lg_desc'] = "";
         $data['make_type'] = $type->make_type();
         $this->model_pd->changePd("bonus_add_money", $data);
     }
@@ -159,6 +165,52 @@ class predeposit_helper
         }
         return '';
     }
+    private function filter_make_type($lg_desc)
+    {
+        $reg = '/make_type=(\d+)/i';
+        $ret = preg_match($reg, $lg_desc, $arr);
+        if($ret > 0) {
+            return intval($arr[1]);
+        } else {
+            return 0;
+        }
+    }
+
+    private function gen_send_title($sender_name,$make_type)
+    {
+        switch ($make_type) {
+            case bonus\type::MakeSendType:
+                return "发出红包";
+            case bonus\type::MakeShakeGainType:
+                return "被{$sender_name}摇走的红包";
+            case bonus\type::MakeShakeLostType:
+                return "摇飞红包";
+            default:
+                return "";
+        }
+    }
+
+    private function gen_gain_title($sender_name,$make_type)
+    {
+        switch ($make_type) {
+            case bonus\type::MakeSendType:
+                return "{$sender_name}的红包";
+            case bonus\type::MakeBonusRefundType:
+                return "未领红包退款";
+            case bonus\type::MakeShakeGainType:
+                return "摇到{$sender_name}的红包";
+            case bonus\type::MakeShakeLostType:
+                return "{$sender_name}摇到你这儿的红包";
+            case bonus\type::MakePayRefundType:
+                return "购物退款红包";
+            case bonus\type::MakePayType:
+                return "购物分享红包";
+            case bonus\type::MakeOrderCancelType:
+                return "订单取消退款";
+            default:
+                return "";
+        }
+    }
 
     public function filter_pd_log($items)
     {
@@ -206,7 +258,8 @@ class predeposit_helper
                 $item['title'] = "虚拟兑码退款成功";
             }
             else if($type == 'hand_out_bonus') {
-                $item['title'] = "发出红包";
+                $make_type = $this->filter_make_type($val['lg_desc']);
+                $item['title'] = $this->gen_send_title($admin_name,$make_type);
                 $item['sn'] = '';
             }
             else if($type == 'bonus_refund') {
@@ -214,7 +267,8 @@ class predeposit_helper
                 $item['sn'] = '';
             }
             else if($type == 'bonus_add_money') {
-                $item['title'] = "{$admin_name}的红包";
+                $make_type = $this->filter_make_type($val['lg_desc']);
+                $item['title'] = $this->gen_gain_title($admin_name,$make_type);
                 $item['sn'] = '';
             }
             else if($type == 'sys_add_money') {

test/relation_helperTest.php

@@ -51,4 +51,11 @@ class relation_helperTest extends PHPUnit_Framework_TestCase
             echo $ex->getMessage();
         }
     }
+
+    public function testMakeType()
+    {
+        $reg = '/make_type=(\d+)/i';
+
+        $ret = preg_match($reg, '发送红包，红包单号: xxxxxx make_type=6', $arr);
+    }
 }