1

application/api_broker/service/DailyPaperService.php

@@ -80,9 +80,6 @@ class DailyPaperService
         $result["is_commit"] = 1;
         switch ($is_store) {
             case 0:
-//                if ($agent_info["level"] != 20 && $agent_info["level"] != 40) {
-//                    return ["code" => 101, "msg" => "非店长不能查看日报"];
-//                }
                 $check_data = $this->checkAgent($agent_info['id']);
                 if ($check_data['code'] != 200) {
                     return ["code" => 101, "msg" => $check_data['msg']];
@@ -144,14 +141,21 @@ class DailyPaperService
         $params["agent_id"]    = array("in", ($ids));
         $params["is_del"]      = 0;
         $params["create_time"] = array("between", array($daily_data, $daily_data . " 23:59:59"));
-        $payLogModel           = new OPayLogModel();
-        $info["sum_arr"]       = $payLogModel->getSum($field, $params);
+
+        $payLogModel       = new OPayLogModel();
+        $officePayLogModel = new OfficeOPayLogModel();
+        $sum_shop          = $payLogModel->getSum($field, $params);
+        $sum_office        = $officePayLogModel->getSum($field, $params);
+        $info["sum_arr"]   = $sum_shop + $sum_office;
 
         $field_adjustment                   = "b.money";
         $params_adjustment["a.agent_id"]    = array("in", ($ids));
         $params_adjustment["b.is_del"]      = 0;
         $params_adjustment["b.create_time"] = array("between", array($daily_data, $daily_data . " 23:59:59"));
-        $info["adjustment_arr"]             = $payLogModel->getAdjustmentSum($field_adjustment, $params_adjustment);
+
+        $adjustment_shop        = $payLogModel->getAdjustmentSum($field_adjustment, $params_adjustment);
+        $adjustment_office      = $officePayLogModel->getAdjustmentSum($field_adjustment, $params_adjustment);
+        $info["adjustment_arr"] = $adjustment_shop + $adjustment_office;
         return $info;
     }
 
@@ -175,8 +179,13 @@ class DailyPaperService
         $params["is_del"]      = 0;
         $params["source"]      = array("in", ("0,1"));
         $params["create_time"] = array("between", array($daily_data, $daily_data . " 23:59:59"));
-        $payLogModel           = new OPayLogModel();
-        $total_arr             = $payLogModel->getTotal($field, $params, "pay_type");
+
+        $payLogModel       = new OPayLogModel();
+        $officePayLogModel = new OfficeOPayLogModel();
+        $total_shop        = $payLogModel->getTotal($field, $params, "pay_type");
+        $total_office      = $officePayLogModel->getTotal($field, $params, "pay_type");
+        $total_arr         = array_merge($total_shop, $total_office);
+        
         $total["alipay"]       = 0;
         $total["alipay_2"]     = 0;
         $total["alipay_3"]     = 0;//陈志杰支付宝