|
@@ -731,9 +731,9 @@ class SalesroomModel{
|
|
$used_quantity = 0;
|
|
$used_quantity = 0;
|
|
$sales_hexiao_info = M('lionfish_comshop_order_goods_saleshexiao')->where(array('order_id'=>$order_id,'order_goods_id'=>$order_goods_id))->find();
|
|
$sales_hexiao_info = M('lionfish_comshop_order_goods_saleshexiao')->where(array('order_id'=>$order_id,'order_goods_id'=>$order_goods_id))->find();
|
|
if($sales_hexiao_info['hexiao_type'] == 1){
|
|
if($sales_hexiao_info['hexiao_type'] == 1){
|
|
- $used_quantity = ($sales_hexiao_info['goods_quantity'] - $sales_hexiao_info['refund_quantity']) - floor($sales_hexiao_info['remain_hexiao_count']/$sales_hexiao_info['one_hexiao_count']);
|
|
|
|
|
|
+ $used_quantity = ($sales_hexiao_info['goods_quantity'] - $sales_hexiao_info['refund_quantity']) - floor($sales_hexiao_info['hexiao_count']/$sales_hexiao_info['one_hexiao_count']);
|
|
}else{
|
|
}else{
|
|
- if($sales_hexiao_info['remain_hexiao_count'] == 0){
|
|
|
|
|
|
+ if($sales_hexiao_info['hexiao_count'] == 0){
|
|
$used_quantity = $sales_hexiao_info['goods_quantity'] - $sales_hexiao_info['refund_quantity'];
|
|
$used_quantity = $sales_hexiao_info['goods_quantity'] - $sales_hexiao_info['refund_quantity'];
|
|
}else{
|
|
}else{
|
|
$used_quantity = 0;
|
|
$used_quantity = 0;
|