shuoruan api update and refilltask model remove task

admin/control/orderstats.php

@@ -149,7 +149,7 @@ class orderstatsControl extends SystemControl
         if(!empty($_GET['cid'])) {
             $condition['cid'] = $_GET['cid'];
         }
-        $task_list = $model->getRefillTaskList($condition, 50);
+        $task_list = $model->getList($condition, 50);
         foreach ($task_list as $key => $value) {
             $task_list[$key]['condition'] = unserialize($value['task_condition']);
         }
@@ -201,7 +201,7 @@ class orderstatsControl extends SystemControl
             $insert['task_condition'] = serialize($condition);
 
             $model = Model('refill_task');
-            $resp = $model->TaskInsert($insert);
+            $resp = $model->insert($insert);
             if($resp) {
                 showMessage('录入成功', 'index.php?act=OrderStats&&op=refill_task');
             }else{
@@ -221,7 +221,7 @@ class orderstatsControl extends SystemControl
     {
         $model = Model('refill_task');
         $hash = md5(serialize($condition) . $task_type . $type);
-        $check = $model->TaskHashCheck($hash);
+        $check = $model->HashCheck($hash);
         if($check) {
             return $hash;
         }else{
@@ -233,7 +233,7 @@ class orderstatsControl extends SystemControl
     {
         $task_id = $_GET['task_id'];
         $model = Model('refill_task');
-        $resp = $model->TaskDel($task_id);
+        $resp = $model->Del($task_id);
         if($resp) {
             showMessage('删除成功', 'index.php?act=OrderStats&&op=refill_task');
         }else{

admin/templates/default/refill.task.php

@@ -208,7 +208,7 @@
                         <?php }?>
                     </td>
                     <td class="align-center">
-                        <a href="index.php?act=OrderStats&op=changeState&task_id=<?php echo $value['task_id'] ?>">删除</a>
+                        <a href="index.php?act=OrderStats&op=task_del&task_id=<?php echo $value['task_id'] ?>">删除</a>
                     </td>
                 </tr>
             <?php } ?>

crontab/control/minutes.php

@@ -648,7 +648,7 @@ class minutesControl extends BaseCronControl
         Log::record(__FUNCTION__,Log::DEBUG);
         $model_refill_task = Model('refill_task');
 
-        $task = $model_refill_task->TaskUnDispose('order_export');
+        $task = $model_refill_task->UnDispose('order_export');
         if (empty($task)) return false;
 
         $task_id = $task['task_id'];
@@ -683,12 +683,12 @@ class minutesControl extends BaseCronControl
             $condition['order_state'] = $order_state;
         }
 
-        $model_refill_task->TaskDispose($task_id);
+        $model_refill_task->Dispose($task_id);
         [$state, $task_result] = $this->order_export($condition, $type, $task_id);
         if ($state) {
-            $model_refill_task->TaskDisposeFinish($task_id, $task_result);
+            $model_refill_task->DisposeFinish($task_id, $task_result);
         } else {
-            $model_refill_task->TaskDisposeErr($task_id, $task_result);
+            $model_refill_task->DisposeErr($task_id, $task_result);
         }
 
         return true;

data/model/refill_task.model.php

@@ -13,7 +13,7 @@ class refill_taskModel extends Model
         parent::__construct('refill_task');
     }
 
-    public function getRefillTaskList($condition, $pagesize = '', $field = '*', $order = 'add_time desc', $limit = '', $master = false): array
+    public function getList($condition, $pagesize = '', $field = '*', $order = 'add_time desc', $limit = '', $master = false): array
     {
         $condition['is_del'] = 0;
         $list = $this->field($field)->where($condition)->page($pagesize)->order($order)->limit($limit)->master($master)->select();
@@ -21,19 +21,14 @@ class refill_taskModel extends Model
         return $list;
     }
 
-    public function TaskInsert($data)
-    {
-        return $this->insert($data);
-    }
-
-    public function TaskHashCheck($hash): bool
+    public function HashCheck($hash): bool
     {
         $condition['is_del'] = 0;
         $condition['task_hash'] = $hash;
         return empty($this->where($condition)->find());
     }
 
-    public function TaskUnDispose($task_type): array
+    public function UnDispose($task_type): array
     {
         $condition['is_del'] = 0;
         $condition['task_state'] = 1;
@@ -43,7 +38,7 @@ class refill_taskModel extends Model
         return $task;
     }
 
-    public function TaskDispose($task_id)
+    public function Dispose($task_id)
     {
         $condition['is_del'] = 0;
         $condition['task_id'] = $task_id;
@@ -52,7 +47,7 @@ class refill_taskModel extends Model
         );
     }
 
-    public function TaskDisposeErr($task_id, $err_msg)
+    public function DisposeErr($task_id, $err_msg)
     {
         $condition['is_del'] = 0;
         $condition['task_id'] = $task_id;
@@ -61,7 +56,7 @@ class refill_taskModel extends Model
         );
     }
 
-    public function TaskDisposeFinish($task_id, $result)
+    public function DisposeFinish($task_id, $result)
     {
         $condition['is_del'] = 0;
         $condition['task_id'] = $task_id;
@@ -70,7 +65,7 @@ class refill_taskModel extends Model
         );
     }
 
-    public function TaskDel($task_id)
+    public function Del($task_id)
     {
         $condition['task_id'] = $task_id;
         return $this->where($condition)->update(

helper/refill/api/xyz/shuoruan/RefillPhone.php

@@ -14,7 +14,6 @@ class RefillPhone extends refill\IRefillPhone
         parent::__construct($cfgs);
     }
 
-    //统一请求
     private function url_request($params, $action)
     {
         $params['action'] = $action;
@@ -25,38 +24,33 @@ class RefillPhone extends refill\IRefillPhone
         $req['busiBody'] = $params;
         $req = json_encode($req);
 
-        return $req;
-
-//        $url = config::API_URL;
-//        $resp = http_post_data($url, $req, config::ExtHeaders, $net_errno);
-//        return iconv('GB2312', 'UTF-8', $resp);
+        $url = config::API_URL;
+        $resp = http_post_data($url, $req, config::ExtHeaders, $net_errno);
+        return iconv('GB2312', 'UTF-8', $resp);
     }
 
-    private function req_params(int $phone,int $amount, string $order_sn,$action)
+    private function req_params(int $phone,int $amount, string $order_sn)
     {
         $params['orderId'] = $order_sn;
         $params['chargeAcct'] = $phone;
         $params['chargeCash'] = $amount;
         $params['chargeType'] = 0;
         $params['retUrl'] = urlencode(config::NOTIFY_URL);
-        $params['action'] = $action;
-        $sign = $this->sign($params);
+        $params['action'] = 'CZ';
 
+        $sign = $this->sign($params);
         $req['sign'] = $sign;
         $req['agentAccount'] = config::ACCOUNT;
         $req['busiBody'] = $params;
-
-        $req = json_encode($req);
-        return $req;
+        return json_encode($req);
     }
 
     public function add($card_no, $card_type, $amount, $params,&$net_errno = 0)
     {
-        $params = $this->req_params($card_no, $amount, $params['order_sn'],'CZ');
-
-
-        $resp = $this->url_request($params,'');
+        $req = $this->req_params($card_no, $amount, $params['order_sn']);
 
+        $resp = http_post_data(config::API_URL, $req, config::ExtHeaders, $net_errno);
+        $resp = iconv('GB2312', 'UTF-8', $resp);
         if (empty($resp)) {
             return [false, '系统错误', true];
         }

helper/refill/api/xyz/xiaoniu/RefillOil.php

@@ -49,6 +49,9 @@ class RefillOil extends refill\IRefillOil
             } elseif ($resp['code'] === '0') {
                 refill\util::inc_card($card_no,$card_info);
                 return [true, $resp['orderNo'], false];
+            } elseif ($resp['code'] === 'XN_1000'){
+                $net_errno = 'XN_1000';
+                return [false, $resp['msg'], false];
             } else {
                 return [false, $resp['msg'], false];
             }

helper/refill/api/xyz/xiaoniu_hf/RefillPhone.php

@@ -46,6 +46,9 @@ class RefillPhone extends refill\IRefillPhone
                 return [false, '系统错误', true];
             } elseif ($resp['code'] === '0') {
                 return [true, $resp['orderNo'], false];
+            } elseif ($resp['code'] === 'XN_1000'){
+                $net_errno = 'XN_1000';
+                return [false, $resp['msg'], false];
             } else {
                 return [false, $resp['msg'], false];
             }

test/TestExportOrder.php

@@ -79,7 +79,7 @@ class TestExportOrder extends TestCase
     {
         $model_refill_task = Model('refill_task');
 
-        $task = $model_refill_task->TaskUnDispose('order_export');
+        $task = $model_refill_task->UnDispose('order_export');
         if (empty($task)) return false;
 
         $task_id = $task['task_id'];
@@ -114,12 +114,12 @@ class TestExportOrder extends TestCase
             $condition['order_state'] = $order_state;
         }
 
-        $model_refill_task->TaskDispose($task_id);
+        $model_refill_task->Dispose($task_id);
         [$state, $task_result] = $this->order_export($condition, $type, $task_id);
         if ($state) {
-            $model_refill_task->TaskDisposeFinish($task_id, $task_result);
+            $model_refill_task->DisposeFinish($task_id, $task_result);
         } else {
-            $model_refill_task->TaskDisposeErr($task_id, $task_result);
+            $model_refill_task->DisposeErr($task_id, $task_result);
         }
         return true;
     }

test/TestRefill.php

@@ -1196,9 +1196,9 @@ class TestRefill extends TestCase
 
     public function testShuoruan()
     {
-//        $providers = $this->getProvider('shuoruan');
+        $providers = $this->getProvider('shuoruan');
 //        $resp = $providers->balance();
-//        $resp = $providers->add(13699279618, 4, 10, ['order_sn' => $this->make_sn()]);
+        $resp = $providers->add(13699279618, 4, 10, ['order_sn' => $this->make_sn()]);
 //        $resp = $providers->query(['order_sn' => '80261634802627091026']);
 
         $params['Action'] = 'CX';
@@ -1215,8 +1215,8 @@ class TestRefill extends TestCase
         $params['Sign'] = '654fbc24c3d0878247bc3be3ed699f16';
 
         $providers = $this->getProvider('shuoruan','RefillCallBack');
-        $ret = $providers->verify($params);
-        $data = $providers->notify($params);
+//        $ret = $providers->verify($params);
+//        $data = $providers->notify($params);
     }
 
     public function testLinzhu()