diff --git a/app/Admin/Controllers/ReportShopOrderController.php b/app/Admin/Controllers/ReportShopOrderController.php index 55c6c400..b8e14c16 100755 --- a/app/Admin/Controllers/ReportShopOrderController.php +++ b/app/Admin/Controllers/ReportShopOrderController.php @@ -42,7 +42,7 @@ class ReportShopOrderController extends AdminController $orders = Order::select([ 'shop_id', - DB::raw('SUM(IF(type = 3, union_money, money)) AS money') + DB::raw('SUM(IF(type = 3, IF(id=pid, money, 0), money)) AS money') ]) ->where('pay_state', PayState::SUCCESS) ->whereIn('lottery_state', [LottState::WIN, LottState::LOSS, LottState::WAIT, LottState::SEND]) diff --git a/app/Console/Commands/Report/GenerateDaySeller.php b/app/Console/Commands/Report/GenerateDaySeller.php index d9721e9c..6425e2bb 100755 --- a/app/Console/Commands/Report/GenerateDaySeller.php +++ b/app/Console/Commands/Report/GenerateDaySeller.php @@ -54,7 +54,7 @@ class GenerateDaySeller extends Command public function report(Seller $seller, $cdate) { $chupiaoMoneyRow = Order::select([ - DB::raw('sum(IF(type = 3, union_money, money)) as m') + DB::raw('sum(IF(type = 3, IF(id=pid, money, 0), money)) as m') ]) ->usable() ->where('draft_date', $cdate) diff --git a/app/Console/Commands/Report/GenerateDayShop.php b/app/Console/Commands/Report/GenerateDayShop.php index 98521356..4e917fc9 100755 --- a/app/Console/Commands/Report/GenerateDayShop.php +++ b/app/Console/Commands/Report/GenerateDayShop.php @@ -62,7 +62,7 @@ class GenerateDayShop extends Command public function report(Shop $shop, $cdate) { $chupiaoMoneyRow = Order::select([ - DB::raw('sum(IF(type = 3, union_money, money)) as m') + DB::raw('sum(IF(type = 3, IF(id=pid, money, 0), money)) as m') ]) ->usable() ->where('draft_date', $cdate) diff --git a/app/Http/Controllers/Api/Customer/CustomerController.php b/app/Http/Controllers/Api/Customer/CustomerController.php index cd0ad7d4..255ba558 100755 --- a/app/Http/Controllers/Api/Customer/CustomerController.php +++ b/app/Http/Controllers/Api/Customer/CustomerController.php @@ -1234,7 +1234,7 @@ class CustomerController extends BaseController $orders = Order::select([ 'customer_id', - DB::raw('SUM(IF(type = 3, union_money, money)) AS money') + DB::raw('SUM(IF(type = 3, IF(id=pid, money, 0), money)) AS money') ])->agentUsable() ->whereIn('customer_id',$customerIdList) ->where('pay_state', PayState::SUCCESS) diff --git a/app/Http/Controllers/Api/Seller/ReportController.php b/app/Http/Controllers/Api/Seller/ReportController.php index 940cee14..9802b805 100755 --- a/app/Http/Controllers/Api/Seller/ReportController.php +++ b/app/Http/Controllers/Api/Seller/ReportController.php @@ -253,7 +253,7 @@ class ReportController extends BaseController } $query = Order::select([ - DB::raw('sum(IF(type = 3, union_money, money)) as money'), + DB::raw('sum(IF(type = 3, IF(id=pid, money, 0), money)) as money'), DB::raw('count(*) as count'), 'lottery_type_id', ]) @@ -747,7 +747,7 @@ class ReportController extends BaseController 'created_at', 'updated_at', 'created_date', - DB::raw('IF(type = 3, union_money, money) AS money') + DB::raw('IF(type = 3, IF(id=pid, money, 0), money) AS money') ]) ->agentUsable() ->where('shop_id', $this->shopId()) @@ -758,7 +758,7 @@ class ReportController extends BaseController ->paging($size); $allMoneyData = Order::select( - DB::raw('SUM(IF(type = 3, union_money, money)) AS money') + DB::raw('SUM(IF(type = 3, IF(id=pid, money, 0), money)) AS money') ) ->agentUsable() ->where('shop_id', $this->shopId())