|
@@ -1111,12 +1111,12 @@ class MemberService
|
|
|
} else if (mb_substr($item['goods_category'], 0, 7) == '会员合伙人产品') {
|
|
|
$item['goods_category'] = '会员合伙人充值';
|
|
|
}
|
|
|
- if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE', 'PARTNER', 'IN'])) {
|
|
|
+ if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE','CROWN_CONTINUE', 'PARTNER', 'IN'])) {
|
|
|
$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','CROWN_CONTINUE'])) {
|
|
|
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'])) {
|
|
@@ -1127,11 +1127,17 @@ class MemberService
|
|
|
// continue;
|
|
|
// }
|
|
|
if (isset($extendJson['added_amount']) && floatval($extendJson['added_amount']) > 0) {
|
|
|
+ $payCategory = 'ADDED';
|
|
|
+ if ($item['pay_category'] == 'GIVE'){
|
|
|
+ $payCategory = 'GIVE';
|
|
|
+ }elseif ($item['pay_category'] == 'CROWN_CONTINUE'){
|
|
|
+ $payCategory = 'CROWN_CONTINUE';
|
|
|
+ }
|
|
|
$data[] = [
|
|
|
'join_pay_member_id' => $item['join_pay_member_id'],
|
|
|
'pay_addtimes' => $item['pay_addtimes'],
|
|
|
'pay_amount' => $extendJson['added_amount'],
|
|
|
- 'pay_category' => $item['pay_category'] == 'GIVE' ? 'GIVE' : 'ADDED',
|
|
|
+ 'pay_category' => $payCategory,
|
|
|
'balance' => number_format($balance, 2, '.', ''),
|
|
|
'balance_type' => 'add',
|
|
|
];
|
|
@@ -1159,22 +1165,28 @@ class MemberService
|
|
|
|
|
|
$item['balance'] = number_format($balance, 2, '.', '');
|
|
|
$balance = $balance - $item['pay_amount'];
|
|
|
- if ($item['pay_category'] != 'GIVE') {
|
|
|
+ if (!in_array($item['pay_category'],['GIVE','CROWN_CONTINUE']) ) {
|
|
|
$data[] = $item;
|
|
|
}
|
|
|
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE', 'PARTNER', 'COMBINE', 'IN'])) {
|
|
|
+ if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE','CROWN_CONTINUE', 'PARTNER', 'COMBINE', 'IN'])) {
|
|
|
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']) && floatval($extendJson['added_amount']) > 0) {
|
|
|
+ $payCategory = 'ADDED';
|
|
|
+ if ($item['pay_category'] == 'GIVE'){
|
|
|
+ $payCategory = 'GIVE';
|
|
|
+ }elseif ($item['pay_category'] == 'CROWN_CONTINUE'){
|
|
|
+ $payCategory = 'CROWN_CONTINUE';
|
|
|
+ }
|
|
|
$data[] = [
|
|
|
'join_pay_member_id' => $item['join_pay_member_id'],
|
|
|
'pay_addtimes' => $item['pay_addtimes'],
|
|
|
'pay_amount' => $extendJson['added_amount'],
|
|
|
- 'pay_category' => $item['pay_category'] == 'GIVE' ? 'GIVE' : 'ADDED',
|
|
|
+ 'pay_category' => $payCategory,
|
|
|
'balance' => number_format($balance, 2, '.', ''),
|
|
|
'balance_type' => 'add',
|
|
|
];
|
|
@@ -1206,7 +1218,7 @@ class MemberService
|
|
|
$balance = $balance + $item['pay_amount'];
|
|
|
}
|
|
|
|
|
|
- if ($item['pay_category'] != 'GIVE') {
|
|
|
+ if (!in_array($item['pay_category'],['GIVE','CROWN_CONTINUE']) ) {
|
|
|
$data[] = $item;
|
|
|
}
|
|
|
}
|