rabin пре 17 часа
родитељ
комит
d1f456a128

+ 2 - 2
src/place/order/app/Lib/Source/Refund.php

@@ -169,7 +169,7 @@ class Refund
             if ($cash['pay_cash'] > 0) {
                 # 走支付退款流程
                 $sector_id = $place_id = 0;
-                if (class_exists('\\Place')) {
+                if (class_exists('\\Place', false)) {
                     $sector_id = Dever::get('Place')->sector['id'];
                     $place_id = Dever::get('Place')->info['id'];
                 } elseif ($muser = Dever::getData('muser')) {
@@ -177,7 +177,7 @@ class Refund
                     $place_id = $muser['select']['data_id'];
                 }
                 $money = Dever::math('mul', $cash['pay_cash'], $score['exp']);
-                $state = Dever::load(\Place\Lib\Account::class)->refund($order['order_num'], $order['pay_money_cash'], $money, $order['order_num'] . '_' . $refund['id'], $sector_id, $place_id, 'source');
+                $state = Dever::load(\Place\Lib\Account::class)->refund($order, $money, $order['order_num'] . '_' . $refund['id'], $sector_id, $place_id, 'source');
                 print_r($state);die;
 
                 Dever::db('porder/source_refund')->update($refund['id'], ['pay_status' => 2]);

+ 5 - 5
src/place/set/app/Lib/Account.php

@@ -29,17 +29,17 @@ class Account
     }
 
     # 退款操作
-    public function refund($order_num, $total, $pay_cash, $refund_order_num, $sector_id, $place_id, $type)
+    public function refund($order, $pay_cash, $refund_order_num, $sector_id, $place_id, $type)
     {
-        $account = Dever::input('platform', 'is_string', '账户', 'weixin');
-        $env = Dever::input('env', 'is_numeric', '运行环境', 3);
+        $account = $order['env_platform'];
+        $env = $order['env_type'];
         $account = $this->getInfo(['key' => 'pay_' . $account]);
         if (!$account) {
             Dever::error('支付账户配置错误');
         }
-        $order['order_num'] = $order_num;
+        $order['order_num'] = $order['order_num'];
         $order['refund_order_num'] = $refund_order_num;
-        $order['total'] = $total*100;
+        $order['total'] = $order['pay_money_cash']*100;
         $order['pay_cash'] = $pay_cash*100;
         $order['notify'] = 'Porder/Lib/Notify.refund|' . $sector_id . '|'  . $place_id . '|' . $type . '|' . $refund_order_num;
 

+ 1 - 1
src/place/set/app/Lib/Info.php

@@ -12,7 +12,7 @@ class Info
             $place_id = $muser['select']['data_id'];
             $place = Dever::db('place/info')->find($place_id);
             $money = Dever::db('sector/money')->find($place['money_id']);
-        } elseif (class_exists('\\Place')) {
+        } elseif (class_exists('\\Place', false)) {
             $money = Dever::get('Place')->money();
         }
         Dever::setData('money', $money);

+ 1 - 1
src/place/stock/app/Lib/Info.php

@@ -14,7 +14,7 @@ class Info
             $this->where['sales_id'] = $type_id;
             $this->table = 'sales';
         } else {
-            if (class_exists('\\Place')) {
+            if (class_exists('\\Place', false)) {
                 if ($place = Dever::get('Place')) {
                     if ($place->info['sales_type'] && $place->info['sales_id']) {
                         $this->where['sales_type'] = $place->info['sales_type'];