|
@@ -510,8 +510,11 @@ class OrdersController extends BaseController
|
|
|
// 针对聚裕的包无法支付的问题(注册时传入了仙女阅读的包名,导致支付时取的支付信息不一致)
|
|
|
$package = $request->header('x-package', '');
|
|
|
if ($package === 'com.juyu.kuaiying.rmyq') {
|
|
|
- $packageInfo = QappPackage::getPackageByPackage($package);
|
|
|
- $params['pay_merchant_id'] = getProp($packageInfo, 'app_pay_merchat_id');
|
|
|
+ $packageInfo = QappPackage::getPackageByPackage($package);
|
|
|
+ $payMerchantId = getProp($packageInfo, 'app_pay_merchat_id');
|
|
|
+ if ($payMerchantId) {
|
|
|
+ $params['pay_merchant_id'] = $payMerchantId;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
} else {
|