更改商家钱包

application/api/controller/shop/ShopHotel.php

@@ -182,7 +182,7 @@ class ShopHotel extends Api
         // 发放商家收益
         $money = bcsub($order['total_amount'],$order['back_amount'],2);// 除去让利后的金额
         $wallet = new ShopWalletBusiness('hotel_order');
-        if (!$wallet->change($info['id'],$money,'money',ShopWalletBusiness::log_type[40],'订单核销','bill',$order['id'])){
+        if (!$wallet->change($info['id'],$money,'balance',ShopWalletBusiness::log_type[40],'订单核销','bill',$order['id'])){
             Db::rollback();
             return $this->error($wallet->getMessage(),$wallet->getData());
         }

application/api/controller/shop/ShopHotelCanteen.php

@@ -182,7 +182,7 @@ class ShopHotelCanteen extends Api
         // 发放商家收益
         $money = bcsub($order['total_amount'],$order['back_amount'],2);// 除去让利后的金额
         $wallet = new ShopWalletBusiness('hotel_canteen_order');
-        if (!$wallet->change($info['id'],$money,'money',ShopWalletBusiness::log_type[40],'订单核销','bill',$order['id'])){
+        if (!$wallet->change($info['id'],$money,'balance',ShopWalletBusiness::log_type[40],'订单核销','bill',$order['id'])){
             Db::rollback();
             return $this->error($wallet->getMessage(),$wallet->getData());
         }

application/api/controller/shop/ShopTravel.php

@@ -184,7 +184,7 @@ class ShopTravel extends Api
         // 发放商家收益
         $money = bcsub($order['total_amount'],$order['back_amount'],2);// 除去让利后的金额
         $wallet = new ShopWalletBusiness('travel_order');
-        if (!$wallet->change($info['id'],$money,'money',ShopWalletBusiness::log_type[80],'订单核销','bill',$order['id'])){
+        if (!$wallet->change($info['id'],$money,'balance',ShopWalletBusiness::log_type[80],'订单核销','bill',$order['id'])){
             Db::rollback();
             return $this->error($wallet->getMessage(),$wallet->getData());
         }

application/common/business/PaymentBusiness.php

@@ -83,6 +83,13 @@ class PaymentBusiness extends BusinessResult
             case 'offline_shop_order':
                 // 线下无需核销，直接待执行
                 $update['back_status'] = 1;// 返佣执行状态:0=无需执行,1=待执行,2=已推送,3=已执行
+                // 发放商家收益
+                $money = bcsub($bill['total_amount'],$bill['back_amount'],2);// 除去让利后的金额
+                $wallet = new ShopWalletBusiness('offline_shop_order');
+                if (!$wallet->change($bill['shop_id'],$money,'balance',ShopWalletBusiness::log_type[70],'线下消费','bill',$bill['id'])){
+                    Db::rollback();
+                    return $this->error($wallet->getMessage(),$wallet->getData());
+                }
                 break;
         }