Merge branch 'master' into dev

app/admin/controller/order/PayDetailController.php

@@ -233,13 +233,13 @@ class PayDetailController extends Curd
                     $item->premises_id = $payExtendJson['remark']['premises_id'] ?? '';
                     $item->premises_name = $payExtendJson['remark']['premises_name'] ?? '';
                 }
-                if (!empty($payExtendJson['added_amount'])){
-                    $addedAmount = sprintf('%.2f',$payExtendJson['added_amount']);
+                if (!empty($payExtendJson['added_amount'])) {
+                    $addedAmount = sprintf('%.2f', $payExtendJson['added_amount']);
                 }
             }
 
             $payObjectJson = [];
-            if (!empty($item->join_pay_object_json)){
+            if (!empty($item->join_pay_object_json)) {
                 $payObjectJson = json_decode($item->join_pay_object_json, true);
             }
             $originPayAmount = $item->pay_amount;
@@ -265,11 +265,15 @@ class PayDetailController extends Curd
                     }
                 }
             }
-            if (!empty($payObjectJson['recharge_config']) && $payObjectJson['recharge_config']['nbr'] > 0){
-                $addedAmount = sprintf('%.2f',round($item->pay_amount * $payObjectJson['recharge_config']['nbr'],2));
+            if (!empty($payObjectJson['recharge_config']) && $payObjectJson['recharge_config']['nbr'] > 0) {
+                if ($item->join_pay_order_id == 'PARTNER') {
+                    $addedAmount = sprintf('%.2f', $payObjectJson['recharge_config']['nbr']);
+                } else {
+                    $addedAmount = sprintf('%.2f', round($item->pay_amount * $payObjectJson['recharge_config']['nbr'], 2));
+                }
             }
             $item->added_amount = $addedAmount;
-            $item->to_account_amount = sprintf('%.2f',$originPayAmount + $addedAmount);
+            $item->to_account_amount = sprintf('%.2f', $originPayAmount + $addedAmount);
             if ($item->pay_category == 'VIP') {
                 $payObjectJson = json_decode($item->join_pay_object_json, true);
                 if (isset($payObjectJson['order_id'])) {
@@ -369,7 +373,12 @@ class PayDetailController extends Curd
             if (!empty($detail['join_pay_object_json'])) {
                 $payObjectJson = json_decode($detail['join_pay_object_json'], true);
                 if (!empty($payObjectJson['recharge_config']) && $payObjectJson['recharge_config']['nbr'] > 0) {
-                    $order['added_amount'] = sprintf('%.2f',round($detail['pay_amount'] * $payObjectJson['recharge_config']['nbr'], 2));
+                    if ($detail['join_pay_order_id'] == 'PARTNER') {
+                        $order['added_amount'] = sprintf('%.2f', $payObjectJson['recharge_config']['nbr']);
+                    } else {
+                        $order['added_amount'] = sprintf('%.2f', round($detail['pay_amount'] * $payObjectJson['recharge_config']['nbr'],2));
+                    }
+//                    $order['added_amount'] = sprintf('%.2f',round($detail['pay_amount'] * $payObjectJson['recharge_config']['nbr'], 2));
                 }
             }
             if ($order['added_amount'] == 0 && !empty($detail['pay_extend_json'])) {