红包修改

data/logic/payment.logic.php

@@ -36,13 +36,10 @@ class paymentLogic
         $condition['pay_sn'] = $pay_sn;
         $order_list = $model_order->getNormalOrderList($condition);
 
-        // 使用红包(预存款)
-        $usebonus = $_GET['usebonus'];
         // 获取余额数据
         $obj_member = Model('member');
         $pd_amount = $obj_member->getPdAmount($member_id);
         //计算本次需要在线支付的订单总金额
-        $usebonus = 1;
         $pay_amount = 0;
         if (!empty($order_list)) {
             foreach ($order_list as $order_info) {

data/model/predeposit.model.php

@@ -362,6 +362,16 @@ class predepositModel extends Model {
                 $data_msg['freeze_amount'] = -$data['amount'];
                 $data_msg['desc'] = $data_log['lg_desc'];
                 break;
+                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'];
+                $data_pd['available_predeposit'] = array('exp','available_predeposit+'.$data['amount']);
+
+                $data_msg['av_amount'] = $data['amount'];
+                $data_msg['freeze_amount'] = 0;
+                $data_msg['desc'] = $data_log['lg_desc'];
+                break;
 				////////////////////zmr>v20////////////////////////////////////
 				case 'sys_add_money':
                 $data_log['lg_av_amount'] = $data['amount'];

shop/control/h5_hb.php

@@ -31,68 +31,6 @@ class h5_hbControl extends BaseH5Control
     }
 
     /**
-     * 添加减少冻结恢复余额(带参数)
-     */
-    private function _add_money_ex($member_id, $pointsnum, $order_sn, $pointsdesc, $operatetype){
-        
-            $obj_validate = new Validate();
-            $obj_validate->validateparam = array(
-                array("input"=>$member_id, "require"=>"true", "message"=>Language::get('admin_points_member_error_again')),
-                array("input"=>$pointsnum, "require"=>"true",'validator'=>'Compare','operator'=>' >= ','to'=>1,"message"=>Language::get('admin_points_points_min_error'))
-            );
-            $error = $obj_validate->validate();
-            if ($error != ''){
-                return -1;
-            }
-            
-            $money = abs(floatval($pointsnum));
-            $memo=trim($pointsdesc);
-            if ($money <= 0) {
-                return -2;  // 输入的金额必需大于0
-            }
-            //查询会员信息
-            $obj_member = Model('member');
-            $member_id = intval($member_id);
-            $member_info = $obj_member->getMemberInfo(array('member_id'=>$member_id));
-
-            if (!is_array($member_info) || count($member_info)<=0){
-                return -3;  // 用户信息不对
-            }
-            $available_predeposit=floatval($member_info['available_predeposit']);
-            $freeze_predeposit=floatval($member_info['freeze_predeposit']);
-            if ($operatetype == 2 && $money > $available_predeposit){
-                return -4; // 预存款不足，会员当前预存款
-            }
-            if ($operatetype == 3 && $money > $available_predeposit){
-                return -5; // 可冻结预存款不足，会员当前预存款
-            }
-            if ($operatetype == 4 && $money > $freeze_predeposit){
-                return -6; // 可恢复冻结预存款不足，会员当前冻结预存款
-            }
-            $model_pd = Model('predeposit');
-            //$order_sn = $model_pd->makeSn();  // ??? 技术债务
-           
-            try {
-                //$model_pd->beginTransaction();
-                //扣除冻结的预存款
-                $data = array();
-                $data['member_id'] = $member_info['member_id'];
-                $data['member_name'] = $member_info['member_name'];
-                $data['amount'] = $money;
-                $data['order_sn'] = $order_sn;
-                $data['admin_name'] = $admininfo['name'];
-                $data['pdr_sn'] = $order_sn;
-                $data['lg_desc'] = $memo;
-                $model_pd->changePd($admin_act,$data);
-                //$model_pd->commit();
-                return 0; // 操作成功
-            } catch (Exception $e) {
-                //$model_pd->rollback();
-                return -7;  // 操作异常
-            }
-    }
-
-    /**
      * 绑定手机号
      */
     public function bindtelOp()
@@ -170,13 +108,6 @@ class h5_hbControl extends BaseH5Control
                     return null;
             }
 
-            // 添加预存款
-            $ret = $this->_add_money_ex($update_info["user_id"], $result[0]['bonus_value'], $result[0]["bonus_sn"], "");
-            if (0 != $ret) {
-                Model::rollback();
-                return null;
-            }
-            
             // 更新掉
             $cond2['bonus_id'] = $result[0]['bonus_id'];
             $update_info['get_time'] = time();