读取合伙人赠送

app/admin/service/member/MemberService.php

@@ -114,7 +114,6 @@ class MemberService
             ->forPage($page, $pageSize)
             ->get()
             ->toArray();
-        dump($rows);
 
         foreach ($rows as &$row) {
             $row['coupon_count'] = CouponDetail::where('join_coupon_detail_member_id', $row['member_id'])->count();
@@ -1026,8 +1025,8 @@ class MemberService
             } else {
                 $item['balance_type'] = 'cut';
             }
-            if ($key == 0 && in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE', 'PARTNER'])) {
-                if (!empty($item['pay_extend_json'])) {
+            if ($key == 0 && in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE', 'PARTNER', 'COMBINE'])) {
+                if (!empty($item['pay_extend_json']) && !in_array($item['join_pay_order_id'],['PARTNER', 'COMBINE'])) {
                     $extendJson = json_decode($item['pay_extend_json'], true);
                     if (!isset($extendJson['added_amount'])) {
                         $extendJson['added_amount'] = 0;
@@ -1047,7 +1046,8 @@ class MemberService
                         ];
                     }
                     $balance = $balance - $extendJson['added_amount'];
-                } elseif (in_array($item['join_pay_order_id'],['PARTNER', 'COMBINE', 'REFERRER'])){
+                }
+                if (in_array($item['join_pay_order_id'],['PARTNER', 'COMBINE'])){
                     $addedAmount = 0;
                     if (!isset($payObjectJson['recharge_config'])) {
                         $addedAmount = 0;