Merge branch 'zjl_activity_20190718' into development

app/Http/Controllers/CronController.php

@@ -35,23 +35,15 @@ class CronController extends Controller
         $OrderRefundModel = new OrderRefundModel();
         $OrderRefundModel = new OrderRefundModel();
         $OrderReturnModel = new OrderReturnModel();
         $OrderReturnModel = new OrderReturnModel();
 
 
-        // // 查询联营、自营线上支付记录
-        // $pay_log_list   = $PayLogModel->getPayLog($start_time, $end_time);
-        // $pay_log_amount = $this->countByCurrency($pay_log_list); // 统计金额
-
-        // // 联营线下支付记录
-        // $joint_offline_list   = $ErpPayLogModel->getErpPayLog($start_time, $end_time);
-        // $joint_offline        = $this->filterData($joint_offline_list); // 过滤数据
-        // $joint_offline_amount = $this->countByCurrency($joint_offline, 'receipt_amount'); // 统计金额
-
         // 查询联营、自营线上支付记录
         // 查询联营、自营线上支付记录
         $pay_log_list   = $PayLogModel->getPayLog($start_time, $end_time);
         $pay_log_list   = $PayLogModel->getPayLog($start_time, $end_time);
-        $pay_log        = $this->filterData($pay_log_list); // 过滤数据
+        $pay_log = $this->filterJointAccounts($pay_log_list); // 过滤掉联营账期 (账期金额根据erp_pay_log表统计)
         $pay_log_amount = $this->countByCurrency($pay_log); // 统计金额
         $pay_log_amount = $this->countByCurrency($pay_log); // 统计金额
 
 
         // 联营线下支付记录
         // 联营线下支付记录
         $joint_offline_list   = $ErpPayLogModel->getErpPayLog($start_time, $end_time);
         $joint_offline_list   = $ErpPayLogModel->getErpPayLog($start_time, $end_time);
-        $joint_offline_amount = $this->countByCurrency($joint_offline_list, 'receipt_amount'); // 统计金额
+        $joint_offline        = $this->filterData($joint_offline_list); // 过滤数据
+        $joint_offline_amount = $this->countByCurrency($joint_offline, 'receipt_amount'); // 统计金额
 
 
         // 自营账期支付记录
         // 自营账期支付记录
         $self_accounts_list   = $RemovalModel->getSelfAccounts($start_time, $end_time);
         $self_accounts_list   = $RemovalModel->getSelfAccounts($start_time, $end_time);
@@ -123,18 +115,22 @@ class CronController extends Controller
         return $RedisModel->get('api_lx_activity_user_rank');
         return $RedisModel->get('api_lx_activity_user_rank');
     }
     }
 
 
-    // 过滤联营线下支付数据
-    public function filterData($data)
+    // 过滤掉联营账期
+    public function filterJointAccounts($data)
     {
     {
         if (!$data) return false;
         if (!$data) return false;
 
 
-        $ErpPayLogModel = new ErpPayLogModel();
+        $OrderModel = new OrderModel();
 
 
         foreach ($data as $k=>$v) {
         foreach ($data as $k=>$v) {
-            $erp_pay_log = $ErpPayLogModel->where(['order_id'=>$v['order_id']])->select('log_id')->first();
+            $map = [];
+            $map['order_id']         = $v['order_id'];
+            $map['order_goods_type'] = 1;
+            $map['order_pay_type']   = 3;
+
+            $order = $OrderModel->where($map)->select('order_id')->first();
 
 
-            // 以ERP推送过来的收款金额为准，若erp_pay_log表里已存在支付记录，则pay_log需要清除
-            if ($erp_pay_log) { 
+            if ($order) { 
                 unset($data[$k]);
                 unset($data[$k]);
                 continue;
                 continue;
             }
             }
@@ -143,25 +139,31 @@ class CronController extends Controller
         return $data;
         return $data;
     }
     }
 
 
-    // // 过滤联营线下支付数据
-    // public function filterData($data)
-    // {
-    //     if (!$data) return false;
+    // 过滤联营线下支付数据
+    public function filterData($data)
+    {
+        if (!$data) return false;
 
 
-    //     $PayLogModel = new PayLogModel();
+        $OrderModel  = new OrderModel();
+        $PayLogModel = new PayLogModel();
 
 
-    //     foreach ($data as $k=>$v) {
-    //         $pay_log = $PayLogModel->where(['order_id'=>$v['order_id']])->select('pay_log_id')->first();
+        foreach ($data as $k=>$v) {
+            $order = $OrderModel->where('order_id',  $v['order_id'])->where('order_goods_type', 1)->where('order_pay_type', '<>', 3)->first();
 
 
-    //         // 若pay_log表里已存在订单支付记录，则说明该订单已收款完成，需要清除
-    //         if ($pay_log) { 
-    //             unset($data[$k]);
-    //             continue;
-    //         }
-    //     }
+            if (!$order) 
+                continue;
+
+            $pay_log = $PayLogModel->where('order_id', $v['order_id'])->select('pay_log_id')->first();
 
 
-    //     return $data;
-    // }
+            // 若非账期且pay_log表里已存在订单支付记录，则说明该订单已收款完成，需要清除
+            if ($pay_log) { 
+                unset($data[$k]);
+                continue;
+            }
+        }
+
+        return $data;
+    }
 
 
     // 根据币种统计用户金额
     // 根据币种统计用户金额
     public function countByCurrency($data, $field='pay_amount')
     public function countByCurrency($data, $field='pay_amount')
@@ -232,7 +234,7 @@ class CronController extends Controller
 
 
         $temp = json_decode(curlApi($url, $check, "POST"), true);
         $temp = json_decode(curlApi($url, $check, "POST"), true);
 
 
-        return isset($temp['data']) ? $temp['data'] : 6.9;
+        return isset($temp['data']) && $temp['data'] ? $temp['data'] : 6.9;
     }
     }
 
 
     // 清除用户表数据和缓存数据
     // 清除用户表数据和缓存数据