rabin 3 lat temu
rodzic
commit
e708abef04
2 zmienionych plików z 3 dodań i 3 usunięć
  1. 2 2
      app/shop/lib/Sell.php
  2. 1 1
      service/mail/lib/Manage.php

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

@@ -984,7 +984,7 @@ class Sell
         	$order_data['card_code_id'] = $card['id'];
             $order_data['card_code_card'] = $card['card'];
             $order_data['card_code_cash'] = $card['cash'];
-        } elseif ($wallet_cash) {
+        } elseif ($wallet_cash && $wallet_cash > 0) {
             $order_data['wallet_cash'] = $wallet_cash;
         }
         if ($user_coupon_id) {
@@ -1180,7 +1180,7 @@ class Sell
                 }
             }
             
-        } elseif ($wallet_cash) {
+        } elseif ($wallet_cash && $wallet_cash > 0) {
             //$wallet_cash = -1*$wallet_cash;
             Dever::load('shop/lib/money')->up($order_data['uid'], 12, $wallet_cash, $order_data['id'], '购买商品', 2);
 

+ 1 - 1
service/mail/lib/Manage.php

@@ -857,7 +857,7 @@ class Manage
             $shop_data = array();
             foreach ($cash_shop as $k => $v) {
                 $shop = Dever::db('shop/info')->find($v['shop_id']);
-                if ($shop) {
+                if ($shop && $shop['type'] != 10) {
                     $shop_data[$v['shop_id']] = $shop['name'];
                 }
             }