debug

app/admin/controller/order/WholeController.php

@@ -4091,6 +4091,16 @@ class WholeController extends Curd
             } elseif ($item['order_is_complete'] == 'R') {
                 $systemStatus = '售后已完成';
             }
+            
+            if ($item['order_is_complete'] != 'R' && !empty($item['order_return_status']) && $item['order_return_status'] == 'PENDING') {
+                $systemStatus = '待处理';
+            } elseif ($item['order_is_complete'] != 'R' && !empty($item['order_return_status']) && $item['order_return_status'] == 'DOING') {
+                $systemStatus = '退款中';
+            } elseif ($item['order_is_complete'] != 'R' && !empty($item['order_return_status']) && $item['order_return_status'] == 'DONE') {
+                $systemStatus = '退款完成';
+            } elseif ($item['order_is_complete'] != 'R' && !empty($item['order_return_status']) && $item['order_return_status'] == 'DISAGREE') {
+                $systemStatus = '不同意退款';
+            }
             $payDetails = PayDetail::where('join_pay_order_id', $item['order_groupby'])
                 ->where('pay_status', 'SUCCESS')
                 ->where('pay_category','<>','REFUND')

app/admin/service/statistics/MemberService.php

@@ -12,7 +12,7 @@ class MemberService
         $data = [];
 
         // 会员数量
-        $data['memberCount'] = Member::where('member_is_owner', 'N')->count();
+        $data['memberCount'] = Member::where('member_is_owner', 'N')->where('member_mobile', '<>', '0000')->count();
         // 业主数量
         $data['ownerCount'] = Member::where('member_is_owner', 'Y')->count();
         // 用户总数
@@ -22,7 +22,7 @@ class MemberService
         $data['todayCount'] = Member::where('member_addtimes', '>', $todayTime)->where('member_is_owner', 'N')->count();
         // 本月新增用户数
         $monthTime = strtotime(date('Y-m-01 00:00:00'));
-        $data['monthCount'] = Member::where('member_addtimes', '>', $monthTime)->where('member_is_owner', 'N')->count();
+        $data['monthCount'] = Member::where('member_addtimes', '>', $monthTime)->where('member_mobile', '<>', '0000')->where('member_is_owner', 'N')->count();
 
         // 折线图-会员
         $newAddition = Db::select("
@@ -30,7 +30,7 @@ class MemberService
                 DATE_FORMAT(FROM_UNIXTIME(member_addtimes), '%Y/%m') AS `month`,
                 count(*) as `num` 
             FROM app_member 
-            where member_is_owner='N' and member_addtimes >= UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 12 MONTH)) and member_addtimes <= UNIX_TIMESTAMP()
+            where member_is_owner='N' and member_mobile != '0000' and member_addtimes >= UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 12 MONTH)) and member_addtimes <= UNIX_TIMESTAMP()
             group by month 
             order by month asc ");
         $newAddition12Month = [];