Merge branch 'goods' of 121.43.114.153:/home/git/repositories/shopnc into goods

data/model/member.model.php

@@ -772,7 +772,7 @@ class memberModel extends Model
         
         $model_pd = Model('predeposit');
         $tmp_log_list = array();
-        $pd_log_list = $model_pd->getPdLogList($condition,'','*','lg_id desc');
+        $pd_log_list = $model_pd->getPdLogList($condition,'','*','lg_id asc');
 
         // 订单数据查询条件(只查询已完成订单), 生成订单查询语句, 在详细查询阶段进行批量查询
         $condition_order = "refund_state=0 and delete_state=0 and order_sn in(";

data/model/predeposit.model.php

@@ -254,7 +254,7 @@ class predepositModel extends Model {
 
         $data_log['lg_member_id'] = $data['member_id'];
         $data_log['lg_member_name'] = $data['member_name'];
-        $data_log['lg_add_time'] = TIMESTAMP;
+        $data_log['lg_add_time'] = time();//TIMESTAMP;//手机端有bug, 不能用宏
         $data_log['lg_type'] = $change_type;
 
         $data_msg['time'] = date('Y-m-d H:i:s');
@@ -362,7 +362,7 @@ class predepositModel extends Model {
                 $data_msg['freeze_amount'] = -$data['amount'];
                 $data_msg['desc'] = $data_log['lg_desc'];
                 break;
-                case 'bonus_add_money':
+            case 'bonus_add_money':
                 $data_log['lg_av_amount'] = $data['amount'];
                 $data_log['lg_desc'] = '红包系统调节预存款【增加】，充值单号: '.$data['pdr_sn'];
                 $data_log['lg_admin_name'] = $data['admin_name'];
@@ -373,7 +373,7 @@ class predepositModel extends Model {
                 $data_msg['desc'] = $data_log['lg_desc'];
                 break;
 				////////////////////zmr>v20////////////////////////////////////
-				case 'sys_add_money':
+			case 'sys_add_money':
                 $data_log['lg_av_amount'] = $data['amount'];
                 $data_log['lg_desc'] = '管理员调节预存款【增加】，充值单号: '.$data['pdr_sn'];
                 $data_log['lg_admin_name'] = $data['admin_name'];
@@ -383,7 +383,7 @@ class predepositModel extends Model {
                 $data_msg['freeze_amount'] = 0;
                 $data_msg['desc'] = $data_log['lg_desc'];
                 break;
-				case 'sys_del_money':
+			case 'sys_del_money':
                 $data_log['lg_av_amount'] = -$data['amount'];
                 $data_log['lg_desc'] = '管理员调节预存款【减少】，充值单号: '.$data['pdr_sn'];
                 $data_pd['available_predeposit'] = array('exp','available_predeposit-'.$data['amount']);
@@ -392,7 +392,7 @@ class predepositModel extends Model {
                 $data_msg['freeze_amount'] = 0;
                 $data_msg['desc'] = $data_log['lg_desc'];
                 break;
-				case 'sys_freeze_money':
+			case 'sys_freeze_money':
                 $data_log['lg_av_amount'] = -$data['amount'];
                 $data_log['lg_freeze_amount'] = $data['amount'];
 				$data_log['lg_desc'] = '管理员调节预存款【冻结】，充值单号: '.$data['pdr_sn'];
@@ -403,7 +403,7 @@ class predepositModel extends Model {
                 $data_msg['freeze_amount'] = $data['amount'];
                 $data_msg['desc'] = $data_log['lg_desc'];
                 break;
-				case 'sys_unfreeze_money':
+			case 'sys_unfreeze_money':
                 $data_log['lg_av_amount'] = $data['amount'];
                 $data_log['lg_freeze_amount'] = -$data['amount'];
                 $data_log['lg_desc'] = '管理员调节预存款【解冻】，充值单号: '.$data['pdr_sn'];