From 64768d3302457dec7497f5c2ba7fa91d583ff733 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Wed, 8 Nov 2023 13:58:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BB=BB=E5=8A=A13=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/ShopRequestLogic.php | 6 +++---
 app/common/logic/task/TaskLogic.php   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/common/logic/ShopRequestLogic.php b/app/common/logic/ShopRequestLogic.php
index 74ff75e40..c30439936 100644
--- a/app/common/logic/ShopRequestLogic.php
+++ b/app/common/logic/ShopRequestLogic.php
@@ -201,12 +201,12 @@ class ShopRequestLogic extends  BaseLogic
     }
 
     /**
-     * 查询镇农科公司负责片区内的种养殖商户和供应链商户交易额
+     * 查询镇农科公司负责片区内的种养殖商户和供应链商户交易额  todo 商城还需确认种养殖商户是何种类型
      */
     public static function getTownTradeAmount($param)
     {
         try {
-            $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '', [
+            $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/supply_chain_breeding_street_product_count', [
                 'query' => $param
             ]);
             return json_decode($requestResponse->getContent(), true);
@@ -222,7 +222,7 @@ class ShopRequestLogic extends  BaseLogic
     public static function getUserTradeAmount($param)
     {
         try {
-            $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '', [
+            $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/store_order_user_trade_amount', [
                 'query' => $param
             ]);
             return json_decode($requestResponse->getContent(), true);
diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php
index 6e25e3837..cfb2df790 100644
--- a/app/common/logic/task/TaskLogic.php
+++ b/app/common/logic/task/TaskLogic.php
@@ -885,7 +885,7 @@ class TaskLogic extends BaseLogic
             'phone' => implode(',', $phoneList)
         ];
         $result = ShopRequestLogic::getUserTradeAmount($param); // todo 对接接口
-        $tradeAmount = $result['data']['trade_amount'];
+        $tradeAmount = $result['data']['procure_amount'];
 
         $totalAmount = bcadd($tradeAmount, $townTransactionPool, 2); // 总的交易金额 = 当日交易额 +  累计交易池
 
@@ -928,7 +928,7 @@ class TaskLogic extends BaseLogic
             'type' => 'street',
         ];
         $result = ShopRequestLogic::getTownTradeAmount($param); // todo 对接接口
-        $tradeAmount = $result['data']['trade_amount'];
+        $tradeAmount = $result['data']['procure_amount'];
 
         // 总交易额 交易池金额+商城交易额
         $totalAmount = bcadd($townTransactionPool, $tradeAmount, 2);