dever 3 years ago
parent
commit
2e50ea9abc
2 changed files with 5 additions and 4 deletions
  1. 3 2
      app/mshop/lib/Buy.php
  2. 2 2
      app/shop/lib/Manage.php

+ 3 - 2
app/mshop/lib/Buy.php

@@ -988,9 +988,10 @@ class Buy
         }
 
         $search_option_type = Dever::input('search_option_type');
-        if ($cash_type == 1 && $search_option_type) {
+        if ($cash_type == 1) {
             if ($search_option_type == 1) {
                 # 门店结算单
+                echo 11;die;
                 $cash_order = Dever::db('cash/order')->select(array('type' => $info['type'], 'type_id' => $info['type_id'], 'source_order_id' => $info['id']));
 
                 $col = 'cash';
@@ -1002,7 +1003,7 @@ class Buy
                 $col = 'p_cash';
             } elseif ($search_option_type == 3) {
                 # 仓库结算单
-                $cash_order = Dever::db('cash/order')->select(array('type' => $info['source_type'], 'type_id' => $info['source_id'], 'source_order_id' => $info['id']));
+                $cash_order = Dever::db('cash/order')->select(array('source_type' => $info['source_type'], 'source_id' => $info['source_id'], 'source_order_id' => $info['id']));
 
                 $col = 'num';
             }

+ 2 - 2
app/shop/lib/Manage.php

@@ -11,9 +11,9 @@ class Manage
         $url = Dever::load('manage/database')->url('list', $order_id, 'buy_order_goods&project=shop&order_id='.$order_id.'&page_type=1');
 
         if ($search == 3) {
-            $url .= '&type=2&search_option_source_type=3';
+            $url .= '&type=2&search_option_type=2';
         } elseif ($search == 2) {
-            $url .= '&type=1&search_option_type=2';
+            $url .= '&type=1&search_option_type=3';
         } else {
             $url .= '&type=1&search_option_type=1';
         }