回调修改！

PHP/Application/Common/Logic/Order/OrderNotifyLogic.class.php

@@ -104,6 +104,46 @@ class OrderNotifyLogic extends BaseLogic
         return $this->updateData($param);
     }
 
+    /**
+     * @desc 手动回调地址
+     * @param $param
+     * @return array
+     */
+    public function notifyDoNocrypt($param){
+        $param = rawurldecode($param);
+        $param = json_decode($param, true);
+        if (!is_array($param)) {
+            return ['status' => 0, 'message' => '[ON1005]参数错误', 'data' => []];
+        }
+        if (!isset($param['document_number']) || $param['document_number'] == '') {
+            return ['status' => 0, 'message' => '[ON1006]第三方订单号不能为空', 'data' => []];
+        }
+        if (!isset($param['out_trade_no']) || $param['out_trade_no'] == '') {
+            return ['status' => 0, 'message' => '[ON1007]订单号不能为空', 'data' => []];
+        }
+        if (!isset($param['pay_status']) || $param['pay_status'] === '') {
+            return ['status' => 0, 'message' => '[ON1008]支付状态不能为空', 'data' => []];
+        }
+        if (!isset($param['amount']) || $param['amount'] == '' || $param['amount'] < 1) {
+            return ['status' => 0, 'message' => '[ON1009]支付金额错误', 'data' => []];
+        }
+        if (!isset($param['pay_time']) || $param['pay_time'] === '') {
+            return ['status' => 0, 'message' => '[ON1010]支付时间不能为空', 'data' => []];
+        }
+
+        //新增验证参数
+        if (!verify($param['merchant_id'],'notnull')) {
+            return ['status' => 0, 'message' => '[ON1011]商户号不能为空', 'data' => []];
+        }
+        if (!verify($param['document_number'],'notnull')) {
+            return ['status' => 0, 'message' => '[ON1012]票据号不能为空', 'data' => []];
+        }
+        if (!verify($param['from_way'],'notnull')) {
+            return ['status' => 0, 'message' => '[ON1013]支付来源不能为空', 'data' => []];
+        }
+
+        return $this->updateData($param);
+    }
     /**
      * @name 更新数据
      * @param $param

PHP/Application/Index/Controller/CliController.class.php

@@ -1122,6 +1122,39 @@ class CliController extends  \Common\Controller\BaseCliController{
         $this->helper('TaskQueue')->send();
     }
 
+    /**
+     * @desc 检查支付状态
+     * @version 2020-08-04
+     * @author yzx
+     */
+    public function checkPay(){
+        $apartment_id = I('apartment_id', null, 'string');//结束时间
+        $page         = I('page', 1, 'intval');
+        $num          = I('num', 9999, 'intval');
+        $service_code = I('service_code', null, 'string');
+        $from_way     = I('from_way', 0, 'intval');
+        $is_complete  = I('is_complete', 0, 'intval');
+        $start_time   = date("Y-m-d",NOW_TIME);
+        $end_time     = date("Y-m-d",NOW_TIME);
+        $pay_start_time    = I('pay_start_time', null, 'string');//开始时间
+        $pay_end_time     = I('pay_end_time', null, 'string');//结束时间
+        $document_number  = I('document_number', null, 'string');//结束时间
+        $is_export    = I('is_export', null, 'intval');//是否导出
+        $list_data = $this->logic('Order\Order')->orderPayCenterLogic($service_code, $page, $num, $apartment_id, $from_way, $is_complete, $start_time, $end_time, 0, $pay_start_time, $pay_end_time, $document_number);
+        if (!empty($list_data['data'])){
+            foreach ($list_data as $k => $v){
+                if ($v['document_number'] == ""){
+                    foreach ($v as $vk => $vv){
+                        if ($vv['pay_status'] == 4){
+                            $result = $this->logic('Order\Order')->checkPayLogic($vv['849512521956cf0999de06f5faae9ef9']);
+                            WL($result,'checkpaylog',1);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
 //    public function addAccount()
 //    {
 //        $sql = "INSERT INTO `publish_lianjia_account` (`city_id`, `account`, `password`, `create_time`, `update_time`, `is_delete`, `delete_time`)

PHP/Application/Order/Controller/OrderNotifyController.class.php

@@ -21,6 +21,21 @@ class OrderNotifyController extends BaseOrderController
         }
         exit;
     }
+    public function notifyDoNocrypt(){
+        $param = I('post.param', '', 'string');
+        if ($param == '') {
+            echo json_encode(['code' => 400, 'message' => '参数错误']);
+            exit;
+        }
+
+        $result = $this->logic('Order\OrderNotify')->notifyDo($param);
+        if ($result['status'] == 0) {
+            echo json_encode(['code' => 300, 'message' => $result['message'], 'data' => $result['data']]);
+        } else {
+            echo json_encode(['code' => 200, 'message' => $result['message'], 'data' => []]);
+        }
+        exit;
+    }
 
     /**
      * @name 测试使用，不传正式。手动模拟支付中心对订单中心的回调