充值成功包含退款

modules/Channel/Services/Order/OrderService.php

@@ -42,11 +42,11 @@ class OrderService
                 $val->company_name = $val->puser_id > 0 ? DB::table('users')->where('id', $val->puser_id)->value("username") : "-";
                 $val->total_count = Order::where('uid', $val->uid)->where('id', "<=", $val->id)->count();
                 if ($val->user_id > 0) {
-                    $val->caompany_count = Order::where('uid', $val->uid)->where('puser_id', '>', 0)->where('puser_id', $val->puser_id)->where('id', "<=", $val->id)->count();
-                    $val->promotion_count = Order::where('uid', $val->uid)->where('puser_id', '>', 0)->where('puser_id', $val->puser_id)->where('user_id', ">", 0)->where('user_id', $val->user_id)->where('id', "<=", $val->id)->count();
+                    $val->caompany_count = Order::where('uid', $val->uid)->where('status','<>', 'UNPAID')->where('puser_id', '>', 0)->where('puser_id', $val->puser_id)->where('id', "<=", $val->id)->count();
+                    $val->promotion_count = Order::where('uid', $val->uid)->where('status','<>', 'UNPAID')->where('puser_id', '>', 0)->where('puser_id', $val->puser_id)->where('user_id', ">", 0)->where('user_id', $val->user_id)->where('id', "<=", $val->id)->count();
                 } else {
-                    $val->caompany_count = Order::where('uid', $val->uid)->where('puser_id', '>', 0)->count();
-                    $val->promotion_count = Order::where('uid', $val->uid)->where('user_id', '>', 0)->count();
+                    $val->caompany_count = Order::where('uid', $val->uid)->where('status','<>', 'UNPAID')->where('puser_id', '>', 0)->count();
+                    $val->promotion_count = Order::where('uid', $val->uid)->where('status','<>', 'UNPAID')->where('user_id', '>', 0)->count();
                 }
                 $val->pay_appid = $val->pay_appid ?: '-';
                 $val->pay_merchant_name = $val->pay_merchant_name ?: '-';