Merge branch 'master' of http://git.dever.cc/dever-product/churen

app/shop/database/user_money.php

@@ -19,6 +19,7 @@ $type = array
     1 => '充值',
     2 => '充值返还',
     3 => '邀请奖励',
+    4 => '商品退款',
     11 => '提现',
     12 => '购买商品',
 );

app/shop/lib/Refund.php

@@ -480,7 +480,32 @@ class Refund
 
             } elseif (isset($order['wallet_cash']) && $order['wallet_cash'] && $order['wallet_cash'] > 0) {
                 # 还原钱包
+                if ($re_cash > 0) {
+                    $wallet_cash = $re_cash;
+                } else {
+                    $wallet_cash = $order['wallet_cash'];
+                }
                 
+                if ($re_cash > 0) {
+                    $wallet_cash = $order['wallet_cash'] - $re_cash;
+                    $order['wallet_cash'] = $re_cash;
+
+                    Dever::db($this->order_table)->update(array('where_id' => $order['id'], 'wallet_cash' => $wallet_cash, 'clear' => true));
+                }
+                Dever::load('shop/lib/money')->up($order['uid'], 4, $wallet_cash, $order['id'], '商品退款', 2);
+                $rorder = $order;
+                $rinfo = $info;
+                $rorder['type'] = 1;
+                $rorder['type_id'] = $rorder['shop_id'];
+                $rorder['source_type'] = 4;
+                $rorder['source_id'] = -1;
+                $rorder['num'] = $info['num'];
+                $rinfo['cash'] = $rorder['price'] = $wallet_cash;
+                $rinfo['p_cash'] = $rorder['p_price'] = $order['wallet_cash'];
+                if (isset($update['status'])) {
+                    $rorder['status'] = $update['status'];
+                }
+                Dever::load('cash/lib/order')->up($rorder, 2, 2, $rinfo, 3);
             }
 
             if ($cash && isset($order['source_id']) && $order['source_id'] && $order['source_id'] > 0) {

app/shop/lib/Sell.php

@@ -417,7 +417,9 @@ class Sell
 
                 } elseif (isset($data['wallet_cash']) && $data['wallet_cash'] && $data['wallet_cash'] > 0) {
                     # 还原钱包
-                    
+                    Dever::load('shop/lib/money')->up($data['uid'], 4, $data['wallet_cash'], $data['id'], '商品退款', 2);
+
+                    Dever::load('cash/lib/order')->up($data, 3, 2, false, 3);
                 }
 
                 $this->updateSell($data, 2);
@@ -1197,7 +1199,16 @@ class Sell
             }
             
         } elseif ($wallet_cash) {
-            Dever::load('shop/lib/money')->up($order_data['uid'], 12, -1*$wallet_cash, $order_data['id'], '购买商品', 2);
+            $wallet_cash = -1*$wallet_cash;
+            Dever::load('shop/lib/money')->up($order_data['uid'], 12, $wallet_cash, $order_data['id'], '购买商品', 2);
+
+            $order_data['type'] = 1;
+            $order_data['type_id'] = $order_data['shop_id'];
+            $order_data['source_type'] = 4;
+            $order_data['source_id'] = -1;
+            $order_data['price'] = $wallet_cash;
+            $order_data['p_price'] = $wallet_cash;
+            Dever::load('cash/lib/order')->up($order_data, 3, 1, false, 3);
         }
 
         # 这里可以记录一下使用日志