财务收支去掉收入俩字

app/admin/controller/notify/RechargeController.php

@@ -158,7 +158,7 @@ class RechargeController
 
                     // 入收支明细表
                     $params['orderId'] = $payObjectJson['order_id'];
-                    $params['inout_category'] = '会员充值收入';
+                    $params['inout_category'] = '会员充值';
                     Event::dispatch('statistics.inout.in', $params);
                 }
             }

app/admin/controller/order/GoodsController.php

@@ -1346,7 +1346,7 @@ class GoodsController extends Curd
                 // 上级提成
                 Event::dispatch('commission.order', $params);
                 // 入收支明细表
-                $params['inout_category'] = '标准订单收入';
+                $params['inout_category'] = '标准订单';
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -1709,7 +1709,7 @@ class GoodsController extends Curd
                 // 上级提成
                 Event::dispatch('commission.order', $params);
                 // 入收支明细表
-                $params['inout_category'] = '标准订单收入';
+                $params['inout_category'] = '标准订单';
                 Event::dispatch('statistics.inout.in', $params);
             }
 

app/admin/controller/order/KangyangCityController.php

@@ -372,7 +372,7 @@ class KangyangCityController extends Curd
             // 触发事件
             if (!empty($params['order_is_complete']) && $params['order_is_complete'] == 'Y' && $params['order_status_payment'] == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买康养城VIP套餐包收入' . $full;
+                $params['inout_category'] = '购买康养城VIP套餐包' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -600,7 +600,7 @@ class KangyangCityController extends Curd
             }// 触发事件
             if ($paymentStatus == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买康养城VIP套餐包收入' . $full;
+                $params['inout_category'] = '购买康养城VIP套餐包' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
 

app/admin/controller/order/NewCustomerController.php

@@ -334,7 +334,7 @@ class NewCustomerController extends Curd
             }
             if ($params['order_status_payment'] == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买组合包收入' . $full;
+                $params['inout_category'] = '购买组合包' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
             if ($params['settlement_now'] == 'Y' && $params['order_status_payment'] != 'SUCCESS') {
@@ -550,7 +550,7 @@ class NewCustomerController extends Curd
             }
             if ($order->order_status_payment == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买组合包收入' . $full;
+                $params['inout_category'] = '购买组合包' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
             if ($order->order_status_payment != 'SUCCESS' && $paymentStatus != 'SUCCESS') {
@@ -1162,7 +1162,7 @@ class NewCustomerController extends Curd
 
                 // 入收支明细表
                 $params['orderId'] = $order['order_id'];
-                $params['inout_category'] = '购买组合包收入' . $full;
+                $params['inout_category'] = '购买组合包' . $full;
                 Event::dispatch('statistics.inout.in', $params);
 
                 return json_success('success');

app/admin/controller/order/PackagesController.php

@@ -1951,7 +1951,7 @@ class PackagesController extends Curd
                 // 上级提成
                 Event::dispatch('commission.order', $params);
                 // 入收支明细表
-                $params['inout_category'] = '标准订单收入';
+                $params['inout_category'] = '标准订单';
                 Event::dispatch('statistics.inout.in', $params);
             }
 

app/admin/controller/order/PartnerController.php

@@ -343,7 +343,7 @@ class PartnerController extends Curd
             }
             if ($params['order_status_payment'] == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买会员合伙人收入' . $full;
+                $params['inout_category'] = '购买会员合伙人' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
             if ($params['settlement_now'] == 'Y' && $params['order_status_payment'] != 'SUCCESS') {
@@ -571,7 +571,7 @@ class PartnerController extends Curd
             }
             if ($order->order_status_payment == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买会员合伙人收入' . $full;
+                $params['inout_category'] = '购买会员合伙人' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
             if ($order->order_status_payment != 'SUCCESS' && $paymentStatus != 'SUCCESS') {
@@ -1258,7 +1258,7 @@ class PartnerController extends Curd
 
                 // 入收支明细表
                 $params['orderId'] = $order['order_id'];
-                $params['inout_category'] = '购买会员合伙人收入' . $full;
+                $params['inout_category'] = '购买会员合伙人' . $full;
                 Event::dispatch('statistics.inout.in', $params);
 
                 return json_success('success');

app/admin/controller/order/PayDetailController.php

@@ -503,7 +503,7 @@ class PayDetailController extends Curd
 
             // 入收支明细表
             $params['orderId'] = $orderId;
-            $params['inout_category'] = '会员充值订单收入';
+            $params['inout_category'] = '会员充值订单';
             Event::dispatch('statistics.inout.in', $params);
 
         } catch (BusinessException $customException) {

app/admin/controller/order/RechargeController.php

@@ -311,7 +311,7 @@ class RechargeController extends Curd
             Db::commit();
             if ($params['order_status_payment'] == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '会员充值订单收入';
+                $params['inout_category'] = '会员充值订单';
                 Event::dispatch('statistics.inout.in', $params);
 
                 // 充值回调
@@ -486,7 +486,7 @@ class RechargeController extends Curd
             Db::commit();
             if ($order->order_status_payment == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '会员充值订单收入';
+                $params['inout_category'] = '会员充值订单';
                 Event::dispatch('statistics.inout.in', $params);
 
                 // 充值回调
@@ -1099,7 +1099,7 @@ class RechargeController extends Curd
                 }
                 // 入收支明细表
                 $params['orderId'] = $order['order_id'];
-                $params['inout_category'] = '会员充值订单收入';
+                $params['inout_category'] = '会员充值订单';
                 Event::dispatch('statistics.inout.in', $params);
 
                 // 充值回调

app/admin/controller/order/ReferrerController.php

@@ -336,7 +336,7 @@ class ReferrerController extends Curd
             }
             if ($params['order_status_payment'] == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买康养推荐官收入' . $full;
+                $params['inout_category'] = '购买康养推荐官' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -564,7 +564,7 @@ class ReferrerController extends Curd
             }
             if ($paymentStatus == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买康养推荐官收入' . $full;
+                $params['inout_category'] = '购买康养推荐官' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -1224,7 +1224,7 @@ class ReferrerController extends Curd
 
                 // 入收支明细表
                 $params['orderId'] = $order['order_id'];
-                $params['inout_category'] = '购买康养推荐官收入' . $full;
+                $params['inout_category'] = '购买康养推荐官' . $full;
                 Event::dispatch('statistics.inout.in', $params);
 
                 return json_success('success');

app/admin/controller/order/ServicesController.php

@@ -1408,7 +1408,7 @@ class ServicesController extends Curd
                 // 上级提成
                 Event::dispatch('commission.order', $params);
                 // 入收支明细表
-                $params['inout_category'] = '标准订单收入';
+                $params['inout_category'] = '标准订单';
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -1841,7 +1841,7 @@ class ServicesController extends Curd
                 // 上级提成
                 Event::dispatch('commission.order', $params);
                 // 入收支明细表
-                $params['inout_category'] = '标准订单收入';
+                $params['inout_category'] = '标准订单';
                 Event::dispatch('statistics.inout.in', $params);
             }
 

app/admin/controller/order/WholeController.php

@@ -1281,7 +1281,7 @@ class WholeController extends Curd
                 // 上级提成
                 Event::dispatch('commission.order', $params);
                 // 入收支明细表
-                $params['inout_category'] = $oldOrderPaymentStatus == 'AWAITING' ? '挂账订单结算收入' : '餐饮订单收入';
+                $params['inout_category'] = $oldOrderPaymentStatus == 'AWAITING' ? '挂账订单结算' : '餐饮订单';
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -1744,7 +1744,7 @@ class WholeController extends Curd
                 // 上级提成
                 Event::dispatch('commission.order', $params);
                 // 入收支明细表
-                $params['inout_category'] = $oldOrderPaymentStatus == 'AWAITING' ? '挂账订单结算收入' : '餐饮订单收入';
+                $params['inout_category'] = $oldOrderPaymentStatus == 'AWAITING' ? '挂账订单结算' : '餐饮订单';
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -2467,7 +2467,7 @@ class WholeController extends Curd
                 // 上级提成
                 Event::dispatch('commission.order', $params);
                 // 入收支明细表
-                $params['inout_category'] = '餐饮订单收入';
+                $params['inout_category'] = '餐饮订单';
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -3025,7 +3025,7 @@ class WholeController extends Curd
                 // 上级提成
                 Event::dispatch('commission.order', $params);
                 // 入收支明细表
-                $params['inout_category'] = '餐饮订单收入';
+                $params['inout_category'] = '餐饮订单';
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -4844,7 +4844,7 @@ class WholeController extends Curd
                         Event::dispatch('commission.order', $params);
                     }
                     // 收支明细
-                    $params['inout_category'] = $oldOrderPaymentStatus == 'AWAITING' ? '挂账订单结算收入' : ($order->order_classify == 'VIP' ? ('购买康养城VIP套餐包收入' . $full) : '餐饮订单收入');
+                    $params['inout_category'] = $oldOrderPaymentStatus == 'AWAITING' ? '挂账订单结算' : ($order->order_classify == 'VIP' ? ('购买康养城VIP套餐包' . $full) : '餐饮订单收入');
                     Event::dispatch('statistics.inout.in', $params);
 
                     return json_success('success');
@@ -4896,7 +4896,7 @@ class WholeController extends Curd
                     }
 
                     // 收支明细
-                    $params['inout_category'] = $oldOrderPaymentStatus == 'AWAITING' ? '挂账订单结算收入' : ($order->order_classify == 'VIP' ? ('购买康养城VIP套餐包收入' . $full) : '餐饮订单收入');
+                    $params['inout_category'] = $oldOrderPaymentStatus == 'AWAITING' ? '挂账订单结算' : ($order->order_classify == 'VIP' ? ('购买康养城VIP套餐包' . $full) : '餐饮订单收入');
                     Event::dispatch('statistics.inout.in', $params);
 
                     return json_success('success');

app/admin/service/order/OrderService.php

@@ -957,7 +957,7 @@ class OrderService
             foreach ($orders as $orderItem) {
                 $params['member_id'] = $orderItem['join_order_member_id'];
                 $params['orderId'] = $orderItem['order_id'];
-                $params['inout_category'] = '标准订单收入';
+                $params['inout_category'] = '标准订单';
                 Event::dispatch('statistics.inout.in', $params);
             }
         }