Merge branch 'master' into dev

app/admin/service/member/MemberService.php

@@ -1140,6 +1140,22 @@ class MemberService
                             'balance' => number_format($balance, 2, '.', ''),
                             'balance_type' => 'add',
                         ];
+                    } elseif (!empty($payObjectJson['recharge_config']) && $payObjectJson['recharge_config']['nbr'] > 0) {
+                        $payCategory = 'ADDED';
+                        if ($item['pay_category'] == 'GIVE') {
+                            $payCategory = 'GIVE';
+                        } elseif ($item['pay_category'] == 'CROWN_CONTINUE') {
+                            $payCategory = 'CROWN_CONTINUE';
+                        }
+                        $extendJson['added_amount'] = $item['pay_amount'] * $payObjectJson['recharge_config']['nbr'];
+                        $data[] = [
+                            'join_pay_member_id' => $item['join_pay_member_id'],
+                            'pay_addtimes' => $item['pay_addtimes'],
+                            'pay_amount' => $extendJson['added_amount'],
+                            'pay_category' => $payCategory,
+                            'balance' => number_format($balance, 2, '.', ''),
+                            'balance_type' => 'add',
+                        ];
                     }
                     $balance = $balance - $extendJson['added_amount'];
                 }
@@ -1190,6 +1206,23 @@ class MemberService
                             'balance_type' => 'add',
                         ];
                         $balance = $balance - $extendJson['added_amount'];
+                    } elseif (!empty($payObjectJson['recharge_config']) && $payObjectJson['recharge_config']['nbr'] > 0) {
+                        $payCategory = 'ADDED';
+                        if ($item['pay_category'] == 'GIVE') {
+                            $payCategory = 'GIVE';
+                        } elseif ($item['pay_category'] == 'CROWN_CONTINUE') {
+                            $payCategory = 'CROWN_CONTINUE';
+                        }
+                        $extendJson['added_amount'] = $item['pay_amount'] * $payObjectJson['recharge_config']['nbr'];
+                        $data[] = [
+                            'join_pay_member_id' => $item['join_pay_member_id'],
+                            'pay_addtimes' => $item['pay_addtimes'],
+                            'pay_amount' => $extendJson['added_amount'],
+                            'pay_category' => $payCategory,
+                            'balance' => number_format($balance, 2, '.', ''),
+                            'balance_type' => 'add',
+                        ];
+                        $balance = $balance - $extendJson['added_amount'];
                     }
                 }
                 if (in_array($item['join_pay_order_id'], ['PARTNER', 'COMBINE'])) {