Commit d19e6a5c authored by hangjun83's avatar hangjun83

1、修复bug

parent 10b1e966
...@@ -311,10 +311,19 @@ class BhOrdersService ...@@ -311,10 +311,19 @@ class BhOrdersService
if($futuresNum > 0 && $refundInfo->handle_fee > 0){ if($futuresNum > 0 && $refundInfo->handle_fee > 0){
throw new \LogicException('包含期货数据,并且期货不支持手续费',500); throw new \LogicException('包含期货数据,并且期货不支持手续费',500);
} }
if($futuresNum == $refundInfo->refund_nums){ if($futuresNum == $refundInfo->refund_nums){
$spotNums = 0; $spotNums = 0;
}elseif($refundInfo->refund_nums > $futuresNum){ }elseif($refundInfo->refund_nums > $futuresNum){
$spotNums = $refundInfo->refund_nums - $futuresNum; if($dpdSum > 0){
$spotNums = $refundInfo->refund_nums - $futuresNum;
}else{
$spotNums = 0;
}
}else{
if($dpdSum == 0){
$spotNums = 0;
}
} }
} }
...@@ -704,8 +713,9 @@ class BhOrdersService ...@@ -704,8 +713,9 @@ class BhOrdersService
$this->cancelAndTransPrePay($dbConnect, $updatedItem['cancel_si_id'], $refundInfo); $this->cancelAndTransPrePay($dbConnect, $updatedItem['cancel_si_id'], $refundInfo);
if($futuresNum > 0){ if($currentProcessNums > 0){
$futuresNum = 0; $futuresNum = 0;
$currentProcessNums = 0;
}else{ }else{
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment