edit

app/cash/lib/Order.php

@@ -77,6 +77,10 @@ class Order
             }
         }
 
+        if (isset($update['cash']) && $update['cash'] <= 0) {
+            return;
+        }
+
         if ($info) {
         	$update['where_id'] = $info['id'];
         	$state = Dever::db('cash/order')->update($update);

app/shop/database/info.php

@@ -744,7 +744,7 @@ return array
             'option' => array
             (
                 'ids' => array('yes-id', 'in'),
-                'name' => array('yes', 'like'),
+                'name' => array('yes-name,sid', 'like'),
                 'id' => 'yes',
                 'state' => 1,
             ),

app/shop/lib/Manage.php

@@ -609,6 +609,7 @@ class Manage
         if ($data) {
             foreach ($data as $k => $v) {
                 if (!$v['mid']) {
+                    $data[$k]['name'] .= '('.$v['sid'].')';
                     $result[] = $data[$k];
                 }
             }
@@ -616,6 +617,20 @@ class Manage
         return $result;
     }
 
+    # 获取所有门店
+    public function search_all_shop_api()
+    {
+        $data = Dever::search('shop/info');
+        $result = array();
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $data[$k]['name'] .= '('.$v['sid'].')';
+                $result[] = $data[$k];
+            }
+        }
+        return $result;
+    }
+
     # 获取零售门店
     public function search_l_shop_api()
     {
@@ -624,6 +639,7 @@ class Manage
         if ($data) {
             foreach ($data as $k => $v) {
                 if ($v['type'] == 2) {
+                    $data[$k]['name'] .= '('.$v['sid'].')';
                     $result[] = $data[$k];
                 }
             }

service/mail/lib/Manage.php

@@ -811,7 +811,7 @@ class Manage
         $shop = array();
         foreach ($shop_id as $k => $v) {
             $where['shop_id'] = $v;
-            $data = Dever::db('mail/area_entry')->getBuy($where);
+            $data = Dever::db('mail/area_entry')->getBuyTotal($where);
             if ($data && $data['total'] >= 0) {
                 $total += $data['total'];
                 if (!isset($shop[$v])) {