dever 3 anni fa
parent
commit
36dcb229a1
1 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  1. 3 3
      app/mshop/lib/Buy.php

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

@@ -552,7 +552,6 @@ class Buy
         $id = Dever::input('order_id');
 
         $type = 1;
-        //$type = Dever::input('search_option_type', 1);
         $type = Dever::input('type', $type);
 
         $cash_type = Dever::input('cash', 1);
@@ -984,13 +983,14 @@ class Buy
         }
 
         if ($cash_type == 1) {
-            if ($type == 1) {
+            $search_option_type = Dever::input('search_option_type', 1);
+            if ($search_option_type == 1) {
                 # 门店结算单
                 $cash_order = Dever::db('cash/order')->select(array('type' => $info['type'], 'type_id' => $info['type_id'], 'source_order_id' => $info['id']));
 
                 $col = 'cash';
 
-            } elseif ($type == 2) {
+            } elseif ($search_option_type == 2) {
                 # 工厂结算单
                 $cash_order = Dever::db('cash/order')->select(array('source_type' => $info['source_type'], 'source_id' => $info['source_id'], 'source_order_id' => $info['id']));