达达

app/saas/controllers/TestController.php

@@ -14,43 +14,37 @@ use common\components\miniUtil;
 class TestController extends PublicController
 {
 	
-	public $withoutLogin = ['open-local-express', 'rabbit'];
-	
 	//开通即时配送
 	public function actionOpenLocalExpress()
 	{
 		$merchant = WxOpenService::getWxInfo();
 		miniUtil::openLocalExpress($merchant, 1);
 	}
-	
-	public function actionDaDa()
+
+	public function actionDada()
 	{
-		
-		//https://github.com/wanDoubleMing/dada_openapi_php
 
-//		$alipayWap = Yii::getAlias("@vendor/alipayWap");
-//		require_once($alipayWap . '/wappay/service/AlipayTradeService.php');
-		
+		//https://github.com/wanDoubleMing/dada_openapi_php
+		//初始化一个配置文件
 		$dada = Yii::getAlias("@vendor/dada/");
-		
-		//2.初始化一个配置文件
-		define("BASE_DIR", dirname(__FILE__) . "/");
 		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;
+		//商户id
+		$sourceId = 73753;
+		$shopNo = 11047059;
 		// 初始化一个config
-		$config = new Config($sourceId, $isOnline);
-		
+		$config = new \Config($sourceId, $isOnline);
+
 		//3.domain文件新建一个model,并初始化
-		$orderModel = new OrderModel();
-		$orderModel->setShopNo('11047059');
-		$orderModel->setOriginId('2018091100000002');
+		$orderModel = new \OrderModel();
+		$orderModel->setShopNo($shopNo);
+		$orderModel->setOriginId('2020043017180001');
 		$orderModel->setCityCode('021');
 		$orderModel->setCargoPrice(10);
 		$orderModel->setIsPrepay(0);
@@ -58,18 +52,17 @@ class TestController extends PublicController
 		$orderModel->setReceiverAddress('上海市崇明岛');
 		$orderModel->setReceiverLat(31.63);
 		$orderModel->setReceiverLng(121.41);
-		$orderModel->setReceiverPhone('18588888888');
-		$orderModel->setCallback('');
-		
-		//4.新建一个api，并初始化
+		$orderModel->setReceiverPhone('15280215347');
+		$orderModel->setCallback('https://api.saas.huaml.com/express/callback');
+
 		// api主要有2个参数，一个是url， 一个是业务参数
-		$addOrderApi = new AddOrderApi(json_encode($orderModel));
-		
+		$addOrderApi = new \AddOrderApi(json_encode($orderModel));
+
 		//5.初始化客户端，并调用rpc
-		$dada_client = new DadaRequestClient($config, $addOrderApi);
+		$dada_client = new \DadaRequestClient($config, $addOrderApi);
 		$resp = $dada_client->makeRequest();
 		echo json_encode($resp);
-		
+
 	}
 
 	public function actionRabbit()

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{
     

vendor/dada/api/cityCodeApi.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 CityCodeApi extends BaseApi{
     

vendor/dada/api/shopAddApi.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 AddShopApi extends BaseApi{
     

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{