|
@@ -1295,7 +1295,7 @@ class Order
|
|
|
|
|
|
if ($goods) {
|
|
|
$table = array();
|
|
|
- $table['head'] = array('权益类型', '权益名称', '权益价值', '权益数量');
|
|
|
+ $table['head'] = array('权益类型', '权益名称', '权益价值', '数量/百分比');
|
|
|
$table['body'] = array();
|
|
|
|
|
|
foreach ($goods as $k => $v) {
|
|
@@ -1311,7 +1311,12 @@ class Order
|
|
|
} elseif ($v['type'] == 2) {
|
|
|
$card = Dever::db('card/info')->find($v['type_id']);
|
|
|
$card['price'] = $card['price'];
|
|
|
- $v['num'] = $v['num'] * $t;
|
|
|
+ if ($card['create_type'] == 3) {
|
|
|
+ $v['num'] = $v['num'] . '%';
|
|
|
+ } else {
|
|
|
+ $v['num'] = $v['num'] * $t;
|
|
|
+ }
|
|
|
+
|
|
|
$table['body'][] = array('电子券', $card['name'], $card['price'], $v['num']);
|
|
|
} elseif ($v['type'] == 3) {
|
|
|
$prize = Dever::db('setting/prize')->find($v['type_id']);
|