完善功能

app/admin/service/member/MemberService.php

@@ -134,9 +134,17 @@ class MemberService
             ->first();
         $balance = $account->member_account_surplus + $account->member_account_added;
 
-        $info = PayDetail::where('join_pay_member_id', $memberId)
-            ->where('pay_status', 'SUCCESS')
-            ->orderByDesc('pay_addtimes')
+        $info = PayDetail::where(function ($query) use ($memberId) {
+            $query->where('join_pay_member_id', $memberId)
+                ->whereIn('pay_prepayid', ['W06', 'A01'])
+                ->where('pay_category', 'RECHARGE')
+                ->where('pay_status', 'SUCCESS');
+        })->orWhere(function ($query) use ($memberId) {
+            $query->where('join_pay_member_id', $memberId)
+                ->whereNotIn('pay_prepayid', ['W06', 'A01'])
+                ->where('pay_category', '<>', 'RECHARGE')
+                ->where('pay_status', 'SUCCESS');
+        })->orderByDesc('pay_addtimes')
             ->get()
             ->toArray();
         $data = [];
@@ -158,12 +166,12 @@ class MemberService
             }
             $item['goods_category'] = implode(',', $categoryName);
 
-            if (in_array($item['pay_category'],['RECHARGE','REFUND'])) {
+            if (in_array($item['pay_category'], ['RECHARGE', 'REFUND'])) {
                 $item['balance_type'] = 'add';
             } else {
                 $item['balance_type'] = 'cut';
             }
-            if ($key == 0 && in_array($item['pay_category'],['RECHARGE','REFUND'])) {
+            if ($key == 0 && in_array($item['pay_category'], ['RECHARGE', 'REFUND'])) {
                 if (!empty($item['pay_extend_json'])) {
                     $extendJson = json_decode($item['pay_extend_json'], true);
                     if (!isset($extendJson['added_amount'])) {
@@ -192,7 +200,7 @@ class MemberService
                 continue;
             }
 
-            if (in_array($item['pay_category'],['RECHARGE','REFUND'])) {
+            if (in_array($item['pay_category'], ['RECHARGE', 'REFUND'])) {
                 if (!empty($item['pay_extend_json'])) {
                     $extendJson = json_decode($item['pay_extend_json'], true);
                     if (isset($extendJson['added_amount'])) {
@@ -404,12 +412,12 @@ class MemberService
                 MemberCert::where('join_cert_member_id', $params['member_id'])->update($certData);
             }
             // member info
-            if(strpos($params['avatar'],getenv('APP_IMAGE_DOMAIN')) !== false || strpos($params['avatar'],getenv('SYSTEM_AVATAR_DOMAIN')) !== false){
+            if (strpos($params['avatar'], getenv('APP_IMAGE_DOMAIN')) !== false || strpos($params['avatar'], getenv('SYSTEM_AVATAR_DOMAIN')) !== false) {
                 $avatar = $params['avatar'];
-            }else{
-                $avatar = getenv('SYSTEM_AVATAR_DOMAIN').str_replace(getenv('STORAGE_DOMAIN'), '', $params['avatar']);
+            } else {
+                $avatar = getenv('SYSTEM_AVATAR_DOMAIN') . str_replace(getenv('STORAGE_DOMAIN'), '', $params['avatar']);
             }
-            
+
             $infoData = [
                 'join_info_member_id' => $memberId,
                 'member_info_nickname' => $params['account_name'],