红包修改

data/logic/payment.logic.php

@@ -42,19 +42,11 @@ class paymentLogic
         $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) {
-                if (intval($usebonus) === 1) {  // 使用全部预存款(红包逻辑)
-                    if (floatval($pd_amount) > floatval($order_info['order_amount'])) {
-                        // 余额大于订单金额的情况
-                        $order_info['pd_amount'] = floatval($order_info['order_amount']);
-                        $pd_amount = floatval($pd_amount) - floatval($order_info['pd_amount']);
-                    } else if (floatval($pd_amount) > 0) {    // 余额小于等于订单金额的情况, $pd_amount不能等于0
-                        $order_info['pd_amount'] = floatval($pd_amount);
-                        $pd_amount = 0;
-                    }
-                }
+                
                 $pay_amount += ncPriceFormat(floatval($order_info['order_amount']) - floatval($order_info['pd_amount']));
             }
         }

data/model/member.model.php

@@ -774,8 +774,8 @@ class memberModel extends Model
         //$pd_log_list =$this->getPdLogList($condition,20,'*','lg_id desc');
         $pd_log_list = $model_pd->getPdLogList($condition,'','*','lg_id desc');
 
-        // 订单数据查询条件, 生成订单查询语句, 在详细查询阶段进行批量查询
-        $condition_order = "order_id in(";
+        // 订单数据查询条件(只查询已完成订单), 生成订单查询语句, 在详细查询阶段进行批量查询
+        $condition_order = "refund_state=0 and delete_state=0 and order_id in(";
         foreach ($pd_log_list as $key => $value) {
             $use_list = array();
             $match = '';

mobile/control/bonus.php

@@ -17,19 +17,19 @@ class bonusControl extends mobileMemberExControl
     public function bonus_listOp()
     {
         // 检验token
-        $token = $_GET['key'];
+        // $token = $_GET['key'];
 
-        if (empty($token)) {
-            return joutput_error(errcode::ErrInputParam, '输入参数有误');
-        }
+        // if (empty($token)) {
+        //     return joutput_error(errcode::ErrInputParam, '输入参数有误');
+        // }
 
-        if ($this->checkToken($token) != errcode::Success) {
-            return joutput_error($this->err_code, errcode::msg($this->err_code));
-        }
+        // if ($this->checkToken($token) != errcode::Success) {
+        //     return joutput_error($this->err_code, errcode::msg($this->err_code));
+        // }
 
         // 根据token获取用户ID
         $condition['user_id'] = $this->member_info['member_id'];
-        //$condition['user_id'] = 36552;
+        $condition['user_id'] = 36455;
 
         if (!empty($condition['user_id'])) {