|
|
@@ -411,6 +411,9 @@ class OrderService extends BaseService
|
|
|
// 商品数据
|
|
|
RedisService::set($cacheLockKey, ['order_id' => $id, 'user_id' => $userId], rand(3, 5));
|
|
|
|
|
|
+ $system = isset($params['system']) && $params['system'] ? $params['system'] : [];
|
|
|
+ $platform = isset($system['platform']) && $system['platform']? $system['platform'] : 'mp';
|
|
|
+
|
|
|
// 用户信息
|
|
|
$userInfo = MemberModel::where(['id' => $userId, 'mark' => 1])
|
|
|
->select(['id', 'openid', 'mobile', 'nickname', 'realname', 'balance', 'status'])
|
|
|
@@ -459,7 +462,12 @@ class OrderService extends BaseService
|
|
|
];
|
|
|
|
|
|
// 调起支付
|
|
|
- $payment = PaymentService::make()->minPay($userInfo, $payOrder, 'store');
|
|
|
+ if($platform == 'wechat'){
|
|
|
+ $payment = PaymentService::make()->mpPay($userInfo, $payOrder, 'store');
|
|
|
+ }else{
|
|
|
+ $payment = PaymentService::make()->minPay($userInfo, $payOrder, 'store');
|
|
|
+ }
|
|
|
+
|
|
|
if (empty($payment)) {
|
|
|
DB::rollBack();
|
|
|
RedisService::clear($cacheLockKey);
|