Merge branch 'dev1'

Administrator

2018-12-04 4d6d0dfe586077c44e70318d5500cf35b92b0d49

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java

@@ -334,7 +334,7 @@
      // 已到账的红包

      int count = hongBaoService.getCount(HongBao.STATE_YILINGQU);

      if (count == 0) {

         data.put("code", "1");

         data.put("code", "0");  //异常

         out.print(data);

         return;

      }

@@ -343,12 +343,12 @@
      if (checked != null && checked.size() > 0) {

         Integer diversity = checked.get(0);

         if (diversity == 0) {

            data.put("code", "0");

            data.put("code", "0");// 异常

         } else {

            data.put("code", "1");

            data.put("code", "1"); // 正常

         }

      } else {

         data.put("code", "1");

         data.put("code", "1"); //正常

      }

      out.print(data);

   }

@@ -1401,19 +1401,26 @@
         return;

      }



      List<Integer> listChecked = extractService.checkExtract(uid);



      if (listChecked == null || listChecked.size() == 0) {

      // 已到账的红包

      int count = hongBaoService.getCount(HongBao.STATE_YILINGQU);

      if (count == 0) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("资金异常"));

         return;

      }

		
      List<Integer> listChecked = extractService.checkExtract(uid);

      if (listChecked == null || listChecked.size() == 0) {

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("资金正常"));

         return;

      }



      Integer diversity = listChecked.get(0);

      if (diversity == 0) {

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("资金正常"));

      } else {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("资金异常"));

      } else {

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("资金正常"));

      }

		
   }



}