|
@@ -31,8 +31,8 @@ class Cash
|
|
$data['merchant_id'] = $merchant['id'];
|
|
$data['merchant_id'] = $merchant['id'];
|
|
$data['order_num'] = $info['merOrderId'];
|
|
$data['order_num'] = $info['merOrderId'];
|
|
$data['source_order_num'] = $order_id;
|
|
$data['source_order_num'] = $order_id;
|
|
- $data['ycash'] = $info['amount'];
|
|
|
|
- $data['cash'] = round($info['amount'] - $info['amount'] * $per, 2);
|
|
|
|
|
|
+ $data['ycash'] = $info['totalAmount'];
|
|
|
|
+ $data['cash'] = round($data['ycash'] - $data['ycash'] * $per, 2);
|
|
if ($yspay['cash_type'] == 1) {
|
|
if ($yspay['cash_type'] == 1) {
|
|
$fz_cash = $data['ycash'];
|
|
$fz_cash = $data['ycash'];
|
|
} else {
|
|
} else {
|