|
@@ -613,8 +613,17 @@ class Sell
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ $data['card']['cash'] = $price;
|
|
|
+ $data['price'] -= $data['card']['cash'];
|
|
|
} else {
|
|
|
$price = $data['price'];
|
|
|
+ if ($card_cash >= $price) {
|
|
|
+ $data['card']['cash'] = $price;
|
|
|
+ $data['price'] = 0;
|
|
|
+ } else {
|
|
|
+ $data['card']['cash'] = $card_cash;
|
|
|
+ $data['price'] -= $data['card']['cash'];
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if ($xian && ($price <= 0 || ($card_info['min'] > 0 && $price < $card_info['min']))) {
|
|
@@ -625,13 +634,7 @@ class Sell
|
|
|
$data['card']['goods'] = $card_goods;
|
|
|
$data['card']['id'] = $card_code['id'];
|
|
|
$data['card']['card'] = $card_code['card'];
|
|
|
- if ($card_cash >= $price) {
|
|
|
- $data['card']['cash'] = $price;
|
|
|
- $data['price'] = 0;
|
|
|
- } else {
|
|
|
- $data['card']['cash'] = $card_cash;
|
|
|
- $data['price'] -= $data['card']['cash'];
|
|
|
- }
|
|
|
+
|
|
|
$data['card']['cash'] = round($data['card']['cash'], 2);
|
|
|
$config = Dever::db('main/sell_config')->find();
|
|
|
$card_type = Dever::db('card/type')->find($card_info['type_id']);
|