修改提现、重置任务数

application/admin/lang/zh-cn.php

@@ -229,4 +229,5 @@ return [
     'Balance'                                               => '余额',
     'Card slip'                                             => '卡单',
     'Collection'                                            => '收款',
+    '多次卡单时'                                              => '多次卡单时，不同单数之间用英文逗号（,）隔开',
 ];

application/admin/view/user/user/cardslip.html

@@ -5,7 +5,7 @@
     <div class="form-group">
         <label for="c-which_start" class="control-label col-xs-12 col-sm-2">{:__('Which start')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-which_start" class="form-control" name="row[which_start]" type="number" value="{$row.which_start|htmlentities}">
+            <input id="c-which_start" class="form-control" name="row[which_start]" placeholder="{:__('多次卡单时')}" type="text" value="{$row.which_start|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/api/controller/Money.php

@@ -221,6 +221,9 @@ class Money extends Api
         if($amount > $user['balance']){
             $this->error(__('余额不足'));
         }
+        if($user['task_num'] != (new Config())->getValue('day_tasks_num')){
+            $this->error(__('任务不足'));
+        }
 
         $withdraw_info = UserModel::getAgentWithdrawInfoByAgentId($user['agent_id']);
         if(empty($withdraw_info)){

application/api/controller/Order.php

@@ -77,6 +77,11 @@ class Order extends Api
             $this->error(__('暂停抢单'));
         }
 
+        if(!($user['freeze'] < 0)){
+            //冻结金额《0时，需要充值
+            $this->error(__('余额不足'));
+        }
+
         if(!($user['balance'] > 0)){
             $this->error(__('余额不足'));
         }
@@ -87,8 +92,8 @@ class Order extends Api
         $amount_max     = $user['balance'] * 0.8;
 
         if($user['task_num'] >= $day_tasks_num){
-            if(!empty($user['task_last_time']) && (time() - $user['task_last_time'] > 86400)){
-                //当日接单量 >= 任务数时，最后一次接单时间已超过24小时，则重置当日接单量
+            if(!empty($user['task_last_time']) && (date('md',time()) != date('md', $user['task_last_time']))){
+                //当日接单量 >= 任务数时，最后一次接单时间和当前不是同一天，则重置当日接单量
                 $user['task_num'] = 0;
                 Users::where('id', $user['id'])->update([
                     'task_num' => 0
@@ -112,8 +117,12 @@ class Order extends Api
             if(empty($limit_task)){
                 $this->error(__('参数错误'));
             }
-            if(($user['task_num'] + 1) == $limit_task['which_start']){
+            $val_arr = explode(',', $limit_task['which_start']);
+            if(in_array($user['task_num'] + 1, $val_arr)){
                 //从这单开始卡单
+                if(!($user['freeze'] > 0)){
+                    //冻结现有余额，并
+                }
                 $task_income    = $task_income * $limit_task['income_multiple'];//单次收益
                 $amount_mini    = $limit_task['min_amount'];
                 $amount_max     = $limit_task['max_amount'];

application/api/lang/zh-cn.php

@@ -19,6 +19,5 @@ return [
     '完成'                                              => '完成',
     '失败'                                             => '失败',
     '取消'                                             => '取消',
-
-
+    '任务不足'                                          => '今日任务还未完成，不能提现',
 ];