edit

app/shop/database/sell_order.php

@@ -642,7 +642,7 @@ return array
 
             'edit' => array('分配仓库', 'store_id'),
 
-            'fast1' => array('发货', '"sell_order_ps&where_id={id}&search_option_order_id={id}&oper_save_jump=sell_order&oper_table=sell_order&oper_parent=sell_order"', '{status} < 3'),
+            'fast1' => array('发货', '"sell_order_ps&where_id={id}&search_option_order_id={id}&oper_save_jump=sell_order&oper_table=sell_order&oper_parent=sell_order"', '{status} < 3 && {shop_type} == 2'),
 
             //'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin,tk_status', '{status} == 6'),
             //'delete' => array('删除', '', '{status} == 1'),

app/shop/lib/Sell.php

@@ -172,8 +172,8 @@ class Sell
             $info['ps_cash'] = 0;
         }
 
-        if (!$info['free_ps_cash']) {
+        if (!$info['ps_cash']) {
-            $info['free_ps_cash'] = 0;
+            $info['ps_cash'] = 0;
         }
 
         if (!$info['wallet_cash']) {