|
@@ -506,9 +506,11 @@ class OrdersController extends BaseController
|
|
|
{
|
|
|
if ($params = $this->getPayParams($request)) {
|
|
|
$params['pay_merchant_id'] = $this->app_pay_merchat_id;
|
|
|
+ myLog('pay-order')->info('wxIndex.params1', compact('params'));
|
|
|
|
|
|
// 针对聚裕的包无法支付的问题(注册时传入了仙女阅读的包名,导致支付时取的支付信息不一致)
|
|
|
- $package = $request->header('x-package', '');
|
|
|
+ $payMerchantId = 0;
|
|
|
+ $package = $request->header('x-package', '');
|
|
|
if ($package === 'com.juyu.kuaiying.rmyq') {
|
|
|
$packageInfo = QappPackage::getPackageByPackage($package);
|
|
|
$payMerchantId = getProp($packageInfo, 'app_pay_merchat_id');
|
|
@@ -516,6 +518,7 @@ class OrdersController extends BaseController
|
|
|
$params['pay_merchant_id'] = $payMerchantId;
|
|
|
}
|
|
|
}
|
|
|
+ myLog('pay-order')->info('wxIndex.params2', compact('params', 'package', 'payMerchantId'));
|
|
|
|
|
|
} else {
|
|
|
return response()->error('QAPP_PARAM_ERROR');
|