Merge branch 'master'

app/Lib/Settlement/SettlementOrder.php

@@ -90,7 +90,7 @@ class SettlementOrder extends SettlementBase
             foreach ($order_ids as $order_id) {
                 $this->BuyDatasMainModel = $this->orderTypeGet($order_id, $bettype);
 
-                if ($this->BuyDatasMainModel->settle_status == 2) {
+                if ($this->BuyDatasMainModel->settle_status == 2 && $settype == 1) {
                     continue;
                 }
                 if ($bettype == 1) {