Merge remote-tracking branch 'origin/master'

admin

2019-01-23 324aea6f8b2d36ea5b6fc1b03d29ad8dfae40259

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

@@ -364,16 +364,33 @@


      Map<String, Object> totalcount = extractCountService.getTodayCount();



      BigDecimal totalmoney = extractCountService.getTodayTotalSuccessMoney();



      totalcount.put("totalmoney", totalmoney);



      // 今日提现成功金额

      BigDecimal todayextractMoney = extractCountService.getTodayTotalSuccessMoney();

		
      // 当前用户余额总计：所有用户总余额

      BigDecimal amountMoney = userInfoCountService.countAllMoney(null);

		
      // 可提现金额限制

      String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY);

      if (minMoney == null){

         minMoney = "0";

      }

      // 当前可提现金额总计： 超过最低提现金额---计入统计

      BigDecimal extractApply = userInfoCountService.countAllMoney(Double.parseDouble(minMoney));

		
      // 累计已提现金额总计：已提现成功的总额/ 次数

      Map<String, Object> resultData = extractCountService.countTotalSuccess();



		
		
      JSONObject data = new JSONObject();

      data.put("todayCount", totalcount);

      data.put("totalount", resultData);



      data.put("todayextractMoney", todayextractMoney);

		
      data.put("amountMoney", amountMoney); // 所有用户总余额

      data.put("extractApply", extractApply); // 可提现金额总计

      data.put("extractNumber", resultData.get("totalamount")); // 提现成功次数

      data.put("extractMoney", resultData.get("totalmoney")); // 提现成功金额

		
      out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

   }



@@ -1498,7 +1515,7 @@
                  year, startTime, endTime);

            

            if (dateType != 3) {

               innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateList, list)));

               innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType,dateList, list)));

            } else {

               // 年视图

               Map<String, Object> map = AdminUtils.yearsDataFactory(list);

@@ -1585,7 +1602,7 @@
               year, startTime, endTime);

         

         if (dateType != 3) {

            innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateList, list)));

            innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));

         } else {

            // 年视图

            Map<String, Object> map = AdminUtils.yearsDataFactory(list);

@@ -1672,7 +1689,7 @@
               year, startTime, endTime);

         

         if (dateType != 3) {

            innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateList, list)));

            innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));

         } else {

            // 年视图

            Map<String, Object> map = AdminUtils.yearsDataFactory(list);

@@ -1702,37 +1719,5 @@
         e.printStackTrace();

      }

   }

	
	
   /**

    * 统计资金信息

    * 
    * @param out

    */

   @RequestMapping(value = "getMoneynfo")

   public void getHistoryInfo(String callback, PrintWriter out) {



      // 累计已提现金额总计：已提现成功的总额

      Map<String, Object> resultData = extractCountService.countTotalSuccess();

      // 当前用户余额总计：所有用户总余额

      BigDecimal amountMoney = userInfoCountService.countAllMoney(null);

		
      // 可提现金额限制

      String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY);

      if (minMoney == null){

         minMoney = "0";

      }

      // 当前可提现金额总计： 超过最低提现金额---计入统计

      BigDecimal extractApply = userInfoCountService.countAllMoney(Double.parseDouble(minMoney));

		
      JSONObject data = new JSONObject();

      data.put("amountMoney", amountMoney);

      data.put("extractApply", extractApply);

      data.put("extractMoney", resultData.get("totalmoney"));

      out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

   }

	
	


   

}