shish 6 лет назад
Родитель
Сommit
aabd09fcf2

+ 2 - 2
.env.example

@@ -15,5 +15,5 @@ RABBIT_MQ_HOST=127.0.0.1
 RABBIT_MQ_PORT=5672
 
 #达达
-DADA_APP_KEY=
-DADA_APP_SECRET=
+DADA_APP_KEY=dadaf2279d901a5ba40
+DADA_APP_SECRET=828a03677a1c00a3a5b3c59209c4433d

+ 47 - 0
app/business/controllers/TestController.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace business\controllers;
+
+use Yii;
+use common\components\util;
+
+class TestController extends BaseController
+{
+
+	public function actionIndex()
+	{
+		$dada = Yii::getAlias("@vendor/dada/");
+		require_once $dada . 'api/addOrderApi.php';
+		require_once $dada . 'client/dadaRequestClient.php';
+		require_once $dada . 'client/dadaResponse.php';
+		require_once $dada . 'config/config.php';
+		require_once $dada . 'model/orderModel.php';
+
+		// isOnline 判断是否是测试环境,会有不同的域名等
+		$isOnline = false;
+		$sourceId = 1000000;
+		// 初始化一个config
+		$config = new \Config($sourceId, $isOnline);
+
+		$orderModel = new \OrderModel();
+		$orderModel->setShopNo('11047059');
+		$orderModel->setOriginId('2018091100000002');
+		$orderModel->setCityCode('021');
+		$orderModel->setCargoPrice(10);
+		$orderModel->setIsPrepay(0);
+		$orderModel->setReceiverName('测试达达');
+		$orderModel->setReceiverAddress('上海市崇明岛');
+		$orderModel->setReceiverLat(31.63);
+		$orderModel->setReceiverLng(121.41);
+		$orderModel->setReceiverPhone('18588888888');
+		$orderModel->setCallback('http://api.b.huaml.com/data/request');
+
+		// api主要有2个参数,一个是url, 一个是业务参数
+		$addOrderApi = new \AddOrderApi(json_encode($orderModel));
+
+		$dada_client = new \DadaRequestClient($config, $addOrderApi);
+		$resp = $dada_client->makeRequest();
+		echo json_encode($resp);
+	}
+
+}

+ 3 - 3
vendor/dada/api/addOrderApi.php

@@ -2,9 +2,9 @@
 /**
  * 发单api
  */
-define("BASE_DIR", dirname(__FILE__) . "/");
-require_once BASE_DIR . 'api/baseApi.php';
-require_once BASE_DIR . 'config/urlConfig.php';
+$dada = Yii::getAlias("@vendor/dada/");
+require_once $dada . 'api/baseApi.php';
+require_once $dada . 'config/urlConfig.php';
 
 class AddOrderApi extends BaseApi{
     

+ 3 - 3
vendor/dada/client/dadaRequestClient.php

@@ -2,10 +2,10 @@
 /**
  * 达达接口请求客户端
  */
-define("BASE_DIR", dirname(__FILE__) . "/");
+$dada = Yii::getAlias("@vendor/dada/");
 
-require_once BASE_DIR . 'client/dadaResponse.php';
-require_once BASE_DIR . 'config/constant.php';
+require_once $dada . 'client/dadaResponse.php';
+require_once $dada . 'config/constant.php';
 
 class DadaRequestClient{
     

+ 2 - 2
vendor/dada/config/config.php

@@ -5,12 +5,12 @@ class Config{
     /**
      * 达达开发者app_key
      */
-    public $app_key = '';
+    public $app_key = getenv('DADA_APP_KEY');
 
     /**
      * 达达开发者app_secret
      */
-    public $app_secret = '';
+    public $app_secret = getenv('DADA_APP_SECRET');
 
     /**
      * api版本