From b11b8fa38711c3ed329634bb66858815483142a6 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 23 Oct 2023 14:03:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Statistics.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controller/api/Statistics.php b/app/controller/api/Statistics.php
index b31e4cf2..f1ae9f44 100644
--- a/app/controller/api/Statistics.php
+++ b/app/controller/api/Statistics.php
@@ -189,21 +189,21 @@ class Statistics extends BaseController
         if (!isset($parmas['goods_id']) || $parmas['goods_id'] == '') {
             return app('json')->fail('goods_id:格式错误');
         }
-        // if (isset($parmas['responsible_area']) && $parmas['responsible_area'] != '') {
-        //     $area[] = ['street_id','in',explode(',', $parmas['responsible_area'])];
-        // }else{
-        //     return app('json')->fail('responsible_area:格式错误');
-        // }
-        // $merchant=Db::name('merchant')->where('street_id','in',$area)->select();
-        // if(!$merchant){
-        //     return app('json')->fail('查询商户为空');
-        // }
+        if (isset($parmas['responsible_area']) && $parmas['responsible_area'] != '') {
+            $area[] = ['street_id','in',explode(',', $parmas['responsible_area'])];
+        }else{
+            return app('json')->fail('responsible_area:格式错误');
+        }
+        $merchant=Db::name('merchant')->where($area)->column('mer_id');
+        if(!$merchant){
+            return app('json')->fail('查询商户为空');
+        }
         $where[]=['p.create_time','between time',[date("Y-m-d H:i:s",$parmas['start_time']),date("Y-m-d H:i:s",$parmas['end_time'])]];
         $where[] = ['p.product_id','in',explode(',', $parmas['goods_id'])];
         $where[] = ['p.is_refund','=',0];
         $count=Db::name('store_order_product')->alias('p')
         ->where($where)
-        // ->join('store_order o','o.mer_id in '.$parmas['mer_intention_id'].' and o.paid=1 and o.is_del=0')
+        ->join('store_order o','o.mer_id in ('.implode(',',$merchant).')  and o.paid=1 and o.is_del=0')
         ->sum('p.total_price');
         return app('json')->success(['procure_amount'=>$count]);
     }