|
@@ -325,7 +325,7 @@ class Manage
|
|
|
|
|
|
private function addGoods($order, $v)
|
|
|
{
|
|
|
- $price = 0;
|
|
|
+ $cash = $price = 0;
|
|
|
$t = intval($order['price']/10000);
|
|
|
if ($t <= 0) {
|
|
|
$t = 1;
|
|
@@ -333,7 +333,8 @@ class Manage
|
|
|
if ($v['type'] == 1) {
|
|
|
$v['num'] = $v['num'] * $t;
|
|
|
$goods_info = Dever::load('goods/lib/info')->getInfoBySku($v['type_id'], $v['sku_id']);
|
|
|
- $price = $goods_info['price'] * $v['num'];
|
|
|
+ $price = $goods_info['price'];
|
|
|
+ $cash = $goods_info['price'] * $v['num'];
|
|
|
if (isset($goods_info['sku'])) {
|
|
|
$sku = '-' . $goods_info['sku']['string'];
|
|
|
} else {
|
|
@@ -347,15 +348,17 @@ class Manage
|
|
|
if (!$card) {
|
|
|
return false;
|
|
|
}
|
|
|
- $price = $card['price']*$v['num'] * $t;
|
|
|
- $v['sku_id'] = Dever::load('card/lib/code')->create($card, 2, $order['mid'], $order['id'], $price);
|
|
|
+ $cash = $card['price']*$v['num'] * $t;
|
|
|
+ $price = $cash;
|
|
|
+ $v['sku_id'] = Dever::load('card/lib/code')->create($card, 2, $order['mid'], $order['id'], $cash);
|
|
|
if (!$v['sku_id']) {
|
|
|
return false;
|
|
|
}
|
|
|
$name = $card['name'];
|
|
|
} elseif ($v['type'] == 3) {
|
|
|
$prize = Dever::db('setting/prize')->find($v['type_id']);
|
|
|
- $price = $prize['price']*$v['num'];
|
|
|
+ $price = $prize['price'];
|
|
|
+ $cash = $prize['price']*$v['num'];
|
|
|
$name = $prize['name'];
|
|
|
}
|
|
|
|
|
@@ -368,7 +371,8 @@ class Manage
|
|
|
if ($info) {
|
|
|
$up['where_id'] = $info['id'];
|
|
|
$up['total_num'] = $info['total_num'] + $v['num'];
|
|
|
- $up['cash'] = $price;
|
|
|
+ $up['cash'] = $cash;
|
|
|
+ $up['price'] = $price;
|
|
|
$up['name'] = $name;
|
|
|
$state = Dever::db('agent/member_goods')->update($up);
|
|
|
|
|
@@ -379,7 +383,8 @@ class Manage
|
|
|
} else {
|
|
|
$up = $where;
|
|
|
$up['total_num'] = $v['num'];
|
|
|
- $up['cash'] = $price;
|
|
|
+ $up['cash'] = $cash;
|
|
|
+ $up['price'] = $price;
|
|
|
$up['name'] = $name;
|
|
|
$state = Dever::db('agent/member_goods')->insert($up);
|
|
|
if ($state) {
|