1

app/admin/controller/user/User.php

@@ -254,10 +254,10 @@ class User extends AuthController
         if ($data['consumer_status'] && $data['consumer']) {//积分增加或者减少
             if ($data['consumer_status'] == 1) {//增加
                 $edit['consumer'] = bcadd($user['consumer'], $data['consumer'], 2);
-                $res2 = UserBillAdmin::income('系统增加消费券', $user['uid'], 'consumer', 'system_add', $data['consumer'], $this->adminId, $edit['consumer'], '系统增加了' . floatval($data['consumer']) . '消费券');
+                $res2 = UserBillAdmin::income('系统增加消费券', $user['uid'], 'consumer', 'system_add_consumer', $data['consumer'], $this->adminId, $edit['consumer'], '系统增加了' . floatval($data['consumer']) . '消费券');
             } else if ($data['consumer_status'] == 2) {//减少
                 $edit['consumer'] = bcsub($user['consumer'], $data['consumer'], 2);
-                $res2 = UserBillAdmin::expend('系统减少消费券', $user['uid'], 'consumer', 'system_sub', $data['consumer'], $this->adminId, $edit['consumer'], '系统扣除了' . floatval($data['consumer']) . '消费券');
+                $res2 = UserBillAdmin::expend('系统减少消费券', $user['uid'], 'consumer', 'system_sub_consumer', $data['consumer'], $this->adminId, $edit['consumer'], '系统扣除了' . floatval($data['consumer']) . '消费券');
             }
         } else {
             $res2 = true;

app/models/user/UserBill.php

@@ -180,10 +180,10 @@ class UserBill extends BaseModel
                 $model = $model->where('type', 'brokerage')->where('pm', 0);
                 break;
             case 5:
-                $model = $model->where('type', 'in', 'system_add_consumer,spread_add_consumer,consumer_product_refund,qr_add_consumer');
+                $model = $model->where('type', 'in', 'system_add_consumer,extract_get_consumer,spread_add_consumer,consumer_product_refund,qr_add_consumer');
                 break;
             case 6:
-                $model = $model->where('type', 'in', 'consumer_product,qr_des_consumer');
+                $model = $model->where('type', 'in', 'consumer_product,qr_des_consumer,system_dec_consumer');
                 break;
         }
         if ($page) $model = $model->page((int)$page, (int)$limit);