Merge branch 'master' into feature/new-backend-adaptation

frontendApi/modules/v1/controllers/BonusController.php

@@ -228,7 +228,7 @@ class BonusController extends BaseController {
                 $condition.=' AND IS_INCR=1 AND DEAL_TYPE_IS_PRESET=0';
             }elseif ($dealType==2){//扣除
                 $condition.=' AND IS_INCR=0 AND DEAL_TYPE_IS_PRESET=0';
-            }else{
+            }else if ($walletType != 'cash') {
                 $condition.=' AND DEAL_TYPE_ID=:DEAL_TYPE';
                 $params[':DEAL_TYPE'] = $dealType;
             }