|
|
@@ -111,6 +111,10 @@ class PaymentLogic extends BaseLogic
|
|
|
case PayEnum::OFFLINE_PAY:
|
|
|
$result = [ 'pay_way' => PayEnum::OFFLINE_PAY ];
|
|
|
break;
|
|
|
+ case PayEnum::MIXED_PAY:
|
|
|
+ $payService = (new WeChatPayService($terminal, $order['user_id'] ?? null));
|
|
|
+ $result = $payService->pay($from, $order);
|
|
|
+ break;
|
|
|
default:
|
|
|
self::$error = '订单异常';
|
|
|
return false;
|
|
|
@@ -163,7 +167,7 @@ class PaymentLogic extends BaseLogic
|
|
|
throw new \Exception('订单已支付');
|
|
|
}
|
|
|
|
|
|
- if (isset($params['code']) && $params['code'] != '' && $params['pay_way'] == PayEnum::WECHAT_PAY) {
|
|
|
+ if (isset($params['code']) && $params['code'] != '' && ($params['pay_way'] == PayEnum::WECHAT_PAY || $params['pay_way'] == PayEnum::MIXED_PAY)) {
|
|
|
switch ($terminal) {
|
|
|
case UserTerminalEnum::WECHAT_MMP:
|
|
|
$response = (new WeChatService())->getMnpResByCode($params);
|