shish 6 лет назад
Родитель
Сommit
862db1d407
2 измененных файлов с 23 добавлено и 25 удалено
  1. 0 13
      app/mall/controllers/TestController.php
  2. 23 12
      app/saas/controllers/TestController.php

+ 0 - 13
app/mall/controllers/TestController.php

@@ -11,17 +11,4 @@ use Yii;
 class TestController extends BaseController
 {
 
-	public $withoutLogin = ['rabbit'];
-
-	public function actionRabbit()
-	{
-		$orderId = 214752;
-		$order = OrderService::getById($orderId);
-		$merchantId = $order['merchantId'];
-		$merchant = MerchantService::getMerchantById($merchantId);
-		$params = ['sourceType' => $order['sourceType'], 'miniAppId' => $merchant['miniAppId'], 'orderId' => $orderId];
-		$type = 'income';
-		InformAdminService::addInform($merchantId, $shopId, $type, $params);
-	}
-
 }

+ 23 - 12
app/saas/controllers/TestController.php

@@ -10,9 +10,9 @@ use common\components\miniUtil;
 
 class TestController extends PublicController
 {
-	
-	public $withoutLogin = ['open-local-express'];
-	
+
+	public $withoutLogin = ['open-local-express', 'rabbit'];
+
 	//开通即时配送
 	public function actionOpenLocalExpress()
 	{
@@ -22,14 +22,14 @@ class TestController extends PublicController
 	
 	public function actionDaDa()
 	{
-
+		
 		//https://github.com/wanDoubleMing/dada_openapi_php
 
 //		$alipayWap = Yii::getAlias("@vendor/alipayWap");
 //		require_once($alipayWap . '/wappay/service/AlipayTradeService.php');
-
+		
 		$dada = Yii::getAlias("@vendor/dada/");
-
+		
 		//2.初始化一个配置文件
 		define("BASE_DIR", dirname(__FILE__) . "/");
 		require_once $dada . 'api/addOrderApi.php';
@@ -37,13 +37,13 @@ class TestController extends PublicController
 		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);
-
+		
 		//3.domain文件新建一个model,并初始化
 		$orderModel = new OrderModel();
 		$orderModel->setShopNo('11047059');
@@ -57,16 +57,27 @@ class TestController extends PublicController
 		$orderModel->setReceiverLng(121.41);
 		$orderModel->setReceiverPhone('18588888888');
 		$orderModel->setCallback('');
-
+		
 		//4.新建一个api,并初始化
 		// api主要有2个参数,一个是url, 一个是业务参数
 		$addOrderApi = new AddOrderApi(json_encode($orderModel));
-
+		
 		//5.初始化客户端,并调用rpc
 		$dada_client = new DadaRequestClient($config, $addOrderApi);
 		$resp = $dada_client->makeRequest();
 		echo json_encode($resp);
-
+		
 	}
-
+	
+	public function actionRabbit()
+	{
+		$orderId = 214752;
+		$order = OrderService::getById($orderId);
+		$merchantId = $order['merchantId'];
+		$merchant = MerchantService::getMerchantById($merchantId);
+		$params = ['sourceType' => $order['sourceType'], 'miniAppId' => $merchant['miniAppId'], 'orderId' => $orderId];
+		$type = 'income';
+		InformAdminService::addInform($merchantId, $shopId, $type, $params);
+	}
+	
 }