|
@@ -66,6 +66,11 @@ class Merchant
|
|
|
$merchant = array();
|
|
|
if ($table == 2) {
|
|
|
$merchant = Dever::db('pay/yspay_merchant')->find(array('account_id' => $account_id, 'type' => 2));
|
|
|
+ if (strstr($order_num, '_')) {
|
|
|
+ $temp = explode('_', $order_num);
|
|
|
+ $order_num = $temp[0];
|
|
|
+ }
|
|
|
+ $order_num .= '_O';
|
|
|
} else {
|
|
|
$project = Dever::db('pay/yspay_project')->find(array('table' => $table));
|
|
|
if ($project) {
|