|
@@ -1413,11 +1413,13 @@ class Order
|
|
|
$t = 1;
|
|
|
}
|
|
|
|
|
|
+ $s = $t;
|
|
|
+
|
|
|
$goods = Dever::db('agent/order_goods')->getData(array('order_id' => $info['id']));
|
|
|
if (!$goods) {
|
|
|
$goods = Dever::db('setting/role_goods')->getData(array('role_id' => $info['role'], 'give' => $info['order_type']));
|
|
|
} else {
|
|
|
- $t = 1;
|
|
|
+ $s = 1;
|
|
|
}
|
|
|
$process_button = array();
|
|
|
if (isset($process[3]['type']) && is_array($process[3]['type']) && in_array(2, $process[3]['type'])) {
|
|
@@ -1457,6 +1459,7 @@ class Order
|
|
|
$v['num'] = $v['num'] * $t;
|
|
|
$table['body'][] = array('商品', $goods_info['name'] . $sku, $goods_info['price'], $v['num']);
|
|
|
} elseif ($v['type'] == 2) {
|
|
|
+ $t = $s;
|
|
|
$card = Dever::db('card/info')->find($v['type_id']);
|
|
|
if ($card) {
|
|
|
if ($card['create_type'] == 3) {
|