|
@@ -31,14 +31,14 @@ class StatisticsController
|
|
|
if ($orderCategory == 'SERVICE') {
|
|
|
$orderCategory = ['SERVICE', 'CHNMED', 'CHNNCD'];
|
|
|
} else if ($orderCategory == 'ALL') {
|
|
|
- $orderCategory = ['SERVICE', 'CHNMED', 'CHNNCD', 'GOODS', 'PACKAGE', 'MEALS', 'RECHARGE', 'COMBINE', 'PARTNER', 'REFERRER', 'VIP'];
|
|
|
+ $orderCategory = ['SERVICE', 'CHNMED', 'CHNNCD', 'GOODS', 'PACKAGE', 'MEALS', 'RECHARGE', 'COMBINE', 'PARTNER', 'REFERRER','FRANCHISEE', 'VIP'];
|
|
|
} else {
|
|
|
$orderCategory = [$orderCategory];
|
|
|
}
|
|
|
|
|
|
$where = '';
|
|
|
if (in_array('RECHARGE', $orderCategory)) {
|
|
|
- $where = " and join_pay_order_id not in ('COMBINE','PARTNER','REFERRER')";
|
|
|
+ $where = " and join_pay_order_id not in ('COMBINE','PARTNER','REFERRER','FRANCHISEE')";
|
|
|
}
|
|
|
|
|
|
$orderCategoryStr = "'" . implode("','", $orderCategory) . "'";
|
|
@@ -54,7 +54,7 @@ class StatisticsController
|
|
|
->where('pay_prepayid','<>', '')
|
|
|
->whereIn('pay_category', $orderCategory)
|
|
|
->when(in_array('RECHARGE', $orderCategory), function ($query) {
|
|
|
- $query->whereNotIn('join_pay_order_id', ['COMBINE', 'PARTNER', 'REFERRER']);
|
|
|
+ $query->whereNotIn('join_pay_order_id', ['COMBINE', 'PARTNER', 'REFERRER','FRANCHISEE']);
|
|
|
})
|
|
|
->sum('pay_amount');
|
|
|
$todayRevenueOrderNbrModel = Db::select("select count(1) as total from (select JSON_EXTRACT(join_pay_object_json,'$.order_id') as order_id from app_pay_detail where
|
|
@@ -70,7 +70,7 @@ class StatisticsController
|
|
|
->where('pay_prepayid','<>', '')
|
|
|
->whereIn('pay_category', $orderCategory)
|
|
|
->when(in_array('RECHARGE', $orderCategory), function ($query) {
|
|
|
- $query->whereNotIn('join_pay_order_id', ['COMBINE', 'PARTNER', 'REFERRER']);
|
|
|
+ $query->whereNotIn('join_pay_order_id', ['COMBINE', 'PARTNER', 'REFERRER','FRANCHISEE']);
|
|
|
})
|
|
|
->sum('pay_amount');
|
|
|
$yesterdayRevenueOrderNbrModel = Db::select("select count(1) as total from (select JSON_EXTRACT(join_pay_object_json,'$.order_id') as order_id from app_pay_detail where
|
|
@@ -87,7 +87,7 @@ class StatisticsController
|
|
|
->where('pay_prepayid','<>', '')
|
|
|
->whereIn('pay_category', $orderCategory)
|
|
|
->when(in_array('RECHARGE', $orderCategory), function ($query) {
|
|
|
- $query->whereNotIn('join_pay_order_id', ['COMBINE', 'PARTNER', 'REFERRER']);
|
|
|
+ $query->whereNotIn('join_pay_order_id', ['COMBINE', 'PARTNER', 'REFERRER','FRANCHISEE']);
|
|
|
})
|
|
|
->sum('pay_amount');
|
|
|
$monthRevenueOrderNbrModel = Db::select("select count(1) as total from (select JSON_EXTRACT(join_pay_object_json,'$.order_id') as order_id from app_pay_detail where
|