|
|
@@ -420,11 +420,7 @@ class OrderService
|
|
|
$categoryArray = explode('-', $prepayId);
|
|
|
if (isset($categoryArray[1])) {
|
|
|
$payWay = $categoryArray[1];
|
|
|
- } else if (in_array($categoryArray[0], ['WXPAY', 'ALIPAY'])) {
|
|
|
- $payWay = $categoryArray[0];
|
|
|
- } else if ($categoryArray[0] == 'OFFLINE') {
|
|
|
- $payWay = $categoryArray[0];
|
|
|
- } else if ($categoryArray[0] == 'MONEY') {
|
|
|
+ } else if (in_array($categoryArray[0], ['WXPAY', 'ALIPAY', 'OFFLINE', 'OFFLINE_ALIPAY', 'OFFLINE_WXPAY', 'MONEY'])) {
|
|
|
$payWay = $categoryArray[0];
|
|
|
}
|
|
|
|
|
|
@@ -438,13 +434,15 @@ class OrderService
|
|
|
];
|
|
|
|
|
|
public static $payWay = [
|
|
|
- 'WXPAY'=>'微信支付',
|
|
|
+ 'WXPAY' => '微信支付',
|
|
|
'ALIPAY' => '支付宝',
|
|
|
'CASH' => '账户余额',
|
|
|
'CARD' => '储值卡',
|
|
|
'WELFARE' => '福利账户',
|
|
|
'MONEY' => '现金',
|
|
|
'OFFLINE' => '线下支付',
|
|
|
+ 'OFFLINE_WXPAY' => '线下支付-微信',
|
|
|
+ 'OFFLINE_ALIPAY' => '线下支付-支付宝',
|
|
|
'QRCODE' => '付款码',
|
|
|
'NONE' => '付零'
|
|
|
];
|
gorden