|
|
@@ -12,6 +12,7 @@ use common\components\qrCodeUtil;
|
|
|
use common\models\xhOrder;
|
|
|
use common\models\xhShop;
|
|
|
use common\services\xhMerchantExtendService;
|
|
|
+use Faker\Provider\Base;
|
|
|
use Yii;
|
|
|
use yii\helpers\Json;
|
|
|
use common\services\xhUserAssetService;
|
|
|
@@ -25,11 +26,13 @@ use common\components\util;
|
|
|
use common\components\stringUtil;
|
|
|
use common\components\configDict;
|
|
|
|
|
|
-class PayController extends MobileendController
|
|
|
+class PayController extends BaseController
|
|
|
{
|
|
|
public $layout = 'centerMain';
|
|
|
public $withoutLogin = ['success', 'exec-alipay', 'detail', 'get-params', 'receive-success', 'not-login-receive-info', 'not-login-save-receive-info'];
|
|
|
|
|
|
+ public $enableCsrfValidation = false;
|
|
|
+
|
|
|
public function actionIndex()
|
|
|
{
|
|
|
$request = Yii::$app->request;
|
|
|
@@ -166,7 +169,8 @@ class PayController extends MobileendController
|
|
|
$memberIntegral = xhMerchantExtendService::getGradeList($merchantExtend, 'desc');
|
|
|
Yii::info(json_encode($merchantExtend));
|
|
|
Yii::info(json_encode($memberIntegral));
|
|
|
- $discount = isset($memberIntegral[$level]['discount']) ? $memberIntegral[$level]['discount'] : $memberIntegral[$level]['discount'];
|
|
|
+ //$discount = isset($memberIntegral[$level]['discount']) ? $memberIntegral[$level]['discount'] : $memberIntegral[$level]['discount'];
|
|
|
+ $discount = 0;
|
|
|
$actPrice = $prePrice;
|
|
|
$couponId = isset($post['couponId']) && !empty($post['couponId']) ? $post['couponId'] : 0;
|
|
|
Yii::info($this->userId . ' ' . $level . ' ' . $discount);
|
|
|
@@ -274,14 +278,12 @@ class PayController extends MobileendController
|
|
|
public function actionExecAlipay()
|
|
|
{
|
|
|
header("Content-type: text/html; charset=utf-8");
|
|
|
-
|
|
|
-
|
|
|
$get = Yii::$app->request->get();
|
|
|
$orderId = isset($get['orderId']) ? $get['orderId'] : 0;
|
|
|
$couponId = isset($get['couponId']) ? $get['couponId'] : 0;
|
|
|
$pay = xhOrderService::getById($orderId);
|
|
|
$merchantId = $pay['merchantId'];
|
|
|
-
|
|
|
+
|
|
|
if ($merchantId == 12358) {
|
|
|
$config = array(
|
|
|
//应用ID,您的APPID。
|