bug

application/api_broker/controller/Statement.php

@@ -31,11 +31,11 @@ class Statement extends Basic
     {
         header('Access-Control-Allow-Origin:*');
         $params = $this->params;
-        /*$params = array(
-            "agent_id" => 3,
+        $params = array(
+            "agent_id" => 715,
             "time_start" => date("Y-m-d", time()),
             "time_end" => date("Y-m-d", time()) . " 23:59:59",
-        );*/
+        );
         if (!isset($params["agent_id"]) || !isset($params["time_start"]) || !isset($params["time_end"])) {
             return $this->response("101", "请求参数错误");
         }

application/api_broker/service/StatementService.php

@@ -151,19 +151,23 @@ class StatementService
 
         $conditions_["district_id"] = $district_id;//本周人数
         $results               = $this->agentModel->countAgentNum($conditions_);
-        dump($results);
+        //dump($results);
         $last_week_total = 0;
-        foreach ($result as $key =>$value){
+        foreach ($results as $key=>$value){
             $last_week_total += $value["agent_num"];
             $paramArr["store_id"] = $value["store_id"];
             $paramArr["level"] = array("in",[20,40]);
             $agentsResult   = $this->agentModel->getAgentsByStoreId($paramArr);
-            $result[$key]["name"] = count($agentsResult) > 0 ? $agentsResult[0]["name"]: null;
-            $result[$key]["last_week_num"] = $value["agent_num"];
-            $result[$key]["agent_num"] = $results[$key]["agent_num"];
+            $results[$key]["name"] = count($agentsResult) > 0 ? $agentsResult[0]["name"]: null;
+            foreach ($result as $i =>$item){
+                if($value["store_id"] == $item["store_id"]){
+                    $results[$key]["last_week_num"] = $item["agent_num"];
                 }
+            }
+        }
+
         $district_list["last_week_total"] = $last_week_total;
-        $district_list["district_list"] = $result;
+        $district_list["district_list"] = $results;
         return $district_list;
     }