Merge branch 'master' into dev

app/admin/controller/notify/RechargeController.php

@@ -133,13 +133,16 @@ class RechargeController
             $memberAccount->save();
            
             // 根据最新的数据，更新用户等级
-            $member = Member::find($payDetail->join_pay_member_id);
-            $roleId = RechargeService::disposeRole($payDetail->join_pay_member_id, $payDetail->pay_amount);
-            if ($roleId && $member->join_member_role_id != $roleId) {
-                $member->join_member_role_id = $roleId;
-                $member->save();
-                // 处理增值套包、组件
-                RechargeService::disposeAdded($roleId, $payDetail->join_pay_member_id);
+            // 临时屏蔽该会员升级
+            if (!in_array($payDetail->join_pay_member_id,['MR2409132254Z9VW'])) {
+                $member = Member::find($payDetail->join_pay_member_id);
+                $roleId = RechargeService::disposeRole($payDetail->join_pay_member_id, $payDetail->pay_amount);
+                if ($roleId && $member->join_member_role_id != $roleId) {
+                    $member->join_member_role_id = $roleId;
+                    $member->save();
+                    // 处理增值套包、组件
+                    RechargeService::disposeAdded($roleId, $payDetail->join_pay_member_id);
+                }
             }
             Db::commit();
 

app/admin/service/member/MemberService.php

@@ -765,12 +765,12 @@ class MemberService
             if (mb_substr($item['goods_category'], 0, 7) == '自定义金额充值') {
                 $item['goods_category'] = '自定义金额充值';
             }
-            if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE'])) {
+            if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE','PARTNER'])) {
                 $item['balance_type'] = 'add';
             } else {
                 $item['balance_type'] = 'cut';
             }
-            if ($key == 0 && in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE'])) {
+            if ($key == 0 && in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE','PARTNER'])) {
                 if (!empty($item['pay_extend_json'])) {
                     $extendJson = json_decode($item['pay_extend_json'], true);
                     if (!isset($extendJson['added_amount'])) {
@@ -802,7 +802,7 @@ class MemberService
                 continue;
             }
 
-            if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE'])) {
+            if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE','PARTNER'])) {
                 if (!empty($item['pay_extend_json'])) {
                     $extendJson = json_decode($item['pay_extend_json'], true);
                     if (isset($extendJson['added_amount']) && floatval($extendJson['added_amount']) > 0) {