stanley-king преди 9 години
родител
ревизия
42148c6e90
променени са 2 файла, в които са добавени 40 реда и са изтрити 13 реда
  1. 4 2
      data/model/member.model.php
  2. 36 11
      helper/predeposit_helper.php

+ 4 - 2
data/model/member.model.php

@@ -619,8 +619,10 @@ class memberModel extends Model
             return false;  // 用户信息不对
         }
 
-        // 预存款订单查询条件(支付, 红包列表)
-        $condition = 'lg_type in(\'order_pay\',\'order_freeze\',\'order_comb_pay\', \'bonus_add_money\', \'hand_out_bonus\', \'sys_add_money\') and lg_member_id=\'' . $member_info['member_id'] . '\'';
+        $types = array('order_pay','order_freeze','order_cancel','order_comb_pay',
+            'recharge','refund','vr_refund','bonus_add_money',
+            'hand_out_bonus','sys_add_money','sys_del_money','sys_freeze_money','sys_unfreeze_money');
+        $condition = array('lg_type' => array('in', $types),'lg_member_id' => $member_info['member_id']);
         $model_pd = Model('predeposit');
         $pd_log_list = $model_pd->getPdLogList($condition,'','*','lg_id desc');
 

+ 36 - 11
helper/predeposit_helper.php

@@ -89,29 +89,54 @@ class predeposit_helper
             $item['freeze_amount'] = $freeze_amount;
             $item['add_time'] = $add_time;
 
+//            $types = array('order_pay','order_freeze','order_cancel','order_comb_pay',
+//                'recharge','refund','vr_refund','cash_apply','cash_pay','cash_del','bonus_add_money',
+//                'hand_out_bonus','sys_add_money','sys_del_money','sys_freeze_money','sys_unfreeze_money');
+
             $fAdd = true;
-            if($type == 'hand_out_bonus') {
-                $item['title'] = "发出红包";
-            }
-            else if($type == 'bonus_add_money') {
-                $item['title'] = "{$admin_name}的红包";
-            }
-            else if($type == 'order_pay') {
+            if($type == 'order_pay') {
                 $item['title'] = "支付订单:{$sn}";
             }
-            else if($type == 'sys_add_money') {
-                $item['title'] = "系统充值";
-            }
             else if($type == 'order_freeze') {
                 $item['title'] = "下单,冻结预存款,订单号:{$sn}";
             }
+            else if($type == 'order_cancel') {
+                $item['title'] = "取消订单,解冻预存款,订单号:{$sn}";
+            }
             else if($type == 'order_comb_pay') {
                 $item['title'] = "下单,支付被冻结的预存款,订单号:{$sn}";
             }
+            else if($type == 'recharge') {
+                $item['title'] = "充值,充值单号:{$sn}";
+            }
+            else if($type == 'refund') {
+                $item['title'] = "确认退款,订单号:{$sn}";
+            }
+            else if($type == 'vr_refund') {
+                $item['title'] = "虚拟兑码退款成功,订单号:{$sn}";
+            }
+            else if($type == 'hand_out_bonus') {
+                $item['title'] = "发出红包,红包号:{$sn}";
+            }
+            else if($type == 'bonus_add_money') {
+                $item['title'] = "{$admin_name}的红包,红包号:{$sn}";
+            }
+            else if($type == 'sys_add_money') {
+                $item['title'] = "管理员调节预存款,充值单号:{$sn}";
+            }
+            else if($type == 'sys_del_money') {
+                $item['title'] = "管理员调节预存款,充值单号:{$sn}";
+            }
+            else if($type == 'sys_freeze_money') {
+                $item['title'] = "管理员冻结预存款,充值单号:{$sn}";
+            }
+            else if($type == 'sys_unfreeze_money') {
+                $item['title'] = "管理员解冻预存款,充值单号:{$sn}";
+            }
             else {
                 $fAdd = false;
             }
-
+            
             if($fAdd) {
                 array_push($pdlogs,$item);
             }