|
|
@@ -85,7 +85,6 @@ class xhMerchantAssetService
|
|
|
$adminOpenIdList = $adminOpenIdArr[$merchant['wxAppId']];
|
|
|
|
|
|
$totalFee = 0;
|
|
|
- $thirdPay = configDict::getConfig('payStyle', 'thirdPay');//第三方支付
|
|
|
$payWayList = configDict::getConfig('payWayName');
|
|
|
$payWay = isset($order['payWay']) ? $order['payWay'] : 0;
|
|
|
$payWay = $payWayList[$payWay];
|
|
|
@@ -132,7 +131,7 @@ class xhMerchantAssetService
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- if ($order['payStyle'] == $thirdPay) {
|
|
|
+
|
|
|
$shortTempId = 'OPENTM207422813';//收入提醒
|
|
|
if (isset($allTM[$shortTempId])) {
|
|
|
$tempId = $allTM[$shortTempId];
|
|
|
@@ -150,7 +149,7 @@ class xhMerchantAssetService
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
break;
|
|
|
}
|