rollback

src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java

@@ -1,6 +1,5 @@
 package au.com.royalpay.payment.manage.appclient.web;
 
-import au.com.royalpay.payment.core.exceptions.NotEnoughBalanceException;
 import au.com.royalpay.payment.core.exceptions.ParamInvalidException;
 import au.com.royalpay.payment.manage.activities.app_index.core.AppActService;
 import au.com.royalpay.payment.manage.activities.monsettledelay.core.ActMonDelaySettleService;
@@ -113,8 +112,7 @@ public class RetailAppController {
 
     @RequestMapping(value = "/orders_new", method = RequestMethod.GET)
     public JSONObject listOrdersNew(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, AppQueryBean query) {
-        throw new NotEnoughBalanceException();
+        return retailAppService.listOrdersNew(device, query);
-//        return retailAppService.listOrdersNew(device, query);
     }
 
     @RequestMapping(value = "/orders/share_code", method = RequestMethod.GET)

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerApplyController.java

@@ -2,7 +2,6 @@ package au.com.royalpay.payment.manage.merchants.web;
 
 import com.google.code.kaptcha.Producer;
 
-import au.com.royalpay.payment.core.exceptions.NotEnoughBalanceException;
 import au.com.royalpay.payment.manage.merchants.beans.ClientApplyInfo;
 import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
 import au.com.royalpay.payment.manage.merchants.core.ClientApply;
@@ -48,10 +47,6 @@ public class PartnerApplyController {
     @Resource
     private Producer captchaProducer;
 
-    @RequestMapping(value = "/asd")
-    public  void asd(){
-        throw new NotEnoughBalanceException();
-    }
     @RequestMapping(method = RequestMethod.POST)
     public void applyPartner(@CookieValue(CommonConsts.CODE_KEY) String codeKey, @RequestBody @Valid ClientApplyInfo apply,
                              Errors errors, HttpServletResponse response) throws Exception {