diff --git a/app/adminapi/controller/task_template/TaskTemplateController.php b/app/adminapi/controller/task_template/TaskTemplateController.php index 736a82ef1..143e8b292 100644 --- a/app/adminapi/controller/task_template/TaskTemplateController.php +++ b/app/adminapi/controller/task_template/TaskTemplateController.php @@ -18,6 +18,7 @@ namespace app\adminapi\controller\task_template; use app\adminapi\controller\BaseAdminController; use app\adminapi\lists\task_template\TaskTemplateLists; +use app\common\logic\ShopRequestLogic; use app\common\logic\task_template\TaskTemplateLogic; use app\adminapi\validate\task_template\TaskTemplateValidate; use app\common\model\Company; @@ -119,5 +120,13 @@ class TaskTemplateController extends BaseAdminController return $this->data($result); } - + public function getProductList() + { + $param = $this->request->param(); // page keyword + $p['page'] = $param['page_no'] ?? 1; + $p['keyword'] = $param['page_no'] ??''; + $result = ShopRequestLogic::getProductList($p); + $result['count'] = 1000; + return $this->data($result); + } } \ No newline at end of file diff --git a/app/common/logic/ShopRequestLogic.php b/app/common/logic/ShopRequestLogic.php index d75e2f430..992568a50 100644 --- a/app/common/logic/ShopRequestLogic.php +++ b/app/common/logic/ShopRequestLogic.php @@ -7,23 +7,17 @@ use think\Exception; class ShopRequestLogic extends BaseLogic { - public static $shopUrlPrefix; - public function __construct() - { - self::$shopUrlPrefix = env('url.shop_prefix'); - parent::__construct(); - } - /** * 查询时间范围内,某一农科公司下的 供应链商户入驻统计 */ public static function getSupplyChainMerchantCount($param) { try { - $requestResponse = HttpClient::create()->request('GET', self::$shopUrlPrefix . '', [ + + $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/supply_chain_mer_count', [ 'query' => $param ]); - return $requestResponse->getContent(); + return json_decode($requestResponse->getContent(), true); } catch (Exception $e) { self::setError($e->getMessage()); return false; @@ -36,10 +30,10 @@ class ShopRequestLogic extends BaseLogic public static function getProductListing($param) { try { - $requestResponse = HttpClient::create()->request('GET', self::$shopUrlPrefix . '', [ + $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/supply_chain_product_count', [ 'query' => $param ]); - return $requestResponse->getContent(); + return json_decode($requestResponse->getContent(), true); } catch (Exception $e) { self::setError($e->getMessage()); return false; @@ -52,10 +46,10 @@ class ShopRequestLogic extends BaseLogic public static function getStockUpdate($param) { try { - $requestResponse = HttpClient::create()->request('GET', self::$shopUrlPrefix . '', [ + $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/supply_chain_product_stock_count', [ 'query' => $param ]); - return $requestResponse->getContent(); + return json_decode($requestResponse->getContent(), true); } catch (Exception $e) { self::setError($e->getMessage()); return false; @@ -68,10 +62,10 @@ class ShopRequestLogic extends BaseLogic public static function getProductList($param) { try { - $requestResponse = HttpClient::create()->request('GET', self::$shopUrlPrefix . '', [ + $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/product_list', [ 'query' => $param ]); - return $requestResponse->getContent(); + return json_decode($requestResponse->getContent(), true); } catch (Exception $e) { self::setError($e->getMessage()); return false; @@ -84,10 +78,10 @@ class ShopRequestLogic extends BaseLogic public static function getPurchaseAmount($param) { try { - $requestResponse = HttpClient::create()->request('GET', self::$shopUrlPrefix . '', [ + $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/statistics/supply_chain_product_price_count', [ 'query' => $param ]); - return $requestResponse->getContent(); + return json_decode($requestResponse->getContent(), true); } catch (Exception $e) { self::setError($e->getMessage()); return false; @@ -100,10 +94,10 @@ class ShopRequestLogic extends BaseLogic public static function getTradeAmount($param) { try { - $requestResponse = HttpClient::create()->request('GET', self::$shopUrlPrefix . '', [ + $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/statistics/supply_chain_product_price_count', [ 'query' => $param ]); - return $requestResponse->getContent(); + return json_decode($requestResponse->getContent(), true); } catch (Exception $e) { self::setError($e->getMessage()); return false; @@ -116,10 +110,10 @@ class ShopRequestLogic extends BaseLogic public static function getGeneralMerchantCount($param) { try { - $requestResponse = HttpClient::create()->request('GET', self::$shopUrlPrefix . '', [ + $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '', [ 'query' => $param ]); - return $requestResponse->getContent(); + return json_decode($requestResponse->getContent(), true); } catch (Exception $e) { self::setError($e->getMessage()); return false; @@ -132,10 +126,10 @@ class ShopRequestLogic extends BaseLogic public static function getGeneralMerchantProductListing($param) { try { - $requestResponse = HttpClient::create()->request('GET', self::$shopUrlPrefix . '', [ + $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '', [ 'query' => $param ]); - return $requestResponse->getContent(); + return json_decode($requestResponse->getContent(), true); } catch (Exception $e) { self::setError($e->getMessage()); return false; @@ -148,10 +142,10 @@ class ShopRequestLogic extends BaseLogic public static function getGeneralMerchantStockUpdate($param) { try { - $requestResponse = HttpClient::create()->request('GET', self::$shopUrlPrefix . '', [ + $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '', [ 'query' => $param ]); - return $requestResponse->getContent(); + return json_decode($requestResponse->getContent(), true); } catch (Exception $e) { self::setError($e->getMessage()); return false; @@ -164,10 +158,10 @@ class ShopRequestLogic extends BaseLogic public static function getGeneralMerchantPurchaseAmount($param) { try { - $requestResponse = HttpClient::create()->request('GET', self::$shopUrlPrefix . '', [ + $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/supply_chain_street_product_price_count', [ 'query' => $param ]); - return $requestResponse->getContent(); + return json_decode($requestResponse->getContent(), true); } catch (Exception $e) { self::setError($e->getMessage()); return false; @@ -180,10 +174,10 @@ class ShopRequestLogic extends BaseLogic public static function getGeneralMerchantTradeAmount($param) { try { - $requestResponse = HttpClient::create()->request('GET', self::$shopUrlPrefix . '', [ + $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/supply_chain_street_product_price_count', [ 'query' => $param ]); - return $requestResponse->getContent(); + return json_decode($requestResponse->getContent(), true); } catch (Exception $e) { self::setError($e->getMessage()); return false; @@ -196,10 +190,10 @@ class ShopRequestLogic extends BaseLogic public static function getPlantingAndBreedingMerchantTradeAmount($param) { try { - $requestResponse = HttpClient::create()->request('GET', self::$shopUrlPrefix . '', [ + $requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '', [ 'query' => $param ]); - return $requestResponse->getContent(); + return json_decode($requestResponse->getContent(), true); } catch (Exception $e) { self::setError($e->getMessage()); return false;