提交

王富生
1 parent a7df42fc
Showing 2 changed files with 25 additions and 51 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BillManageController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/IndexPageStatisticController.java
@@ -92,7 +92,7 @@ public class BillManageController extends BizController {
 			tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode());
 			tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds());
 			tdCompanyParkQueryRequest.setSessionId(request.getSession().getId());
-			billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest));
+			billQueryRequest.setParkIdList(userInfo.getOrgIds());
 		}
  
 		BizResult<PageBean<BillManageDTO>> result = billManageForDayService.queryBillforDayTotalForPage(billQueryRequest);
@@ -35,6 +35,7 @@ import com.zteits.clouds.api.apibase.bean.PageBean;
 import com.zteits.clouds.api.dto.clouds.dto.CustIncomeForPayTypeDTO;
 import com.zteits.clouds.api.dto.clouds.dto.CustIncomeTotalDTO;
 import com.zteits.clouds.api.dto.clouds.dto.CustIncomeTotalParkDTO;
+import com.zteits.clouds.api.dto.clouds.dto.ParkingCountDTO;
 import com.zteits.clouds.api.dto.clouds.param.CustIncomeTotalQueryRequset;
 import com.zteits.clouds.api.dto.park.dto.ParkingLotDTO;
 import com.zteits.clouds.api.dto.park.dto.ParkingLotUseStatisticDTO;
@@ -93,7 +94,7 @@ public class IndexPageStatisticController extends BizController {
     public BizResultVO<CustIncomeTotalVO> queryCustIncomeTotal(
         @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset)
         throws Exception {
-
+        logger.info("---begin企业云平台首页-实际收入查询,入参={}",JSONObject.toJSON(custIncomeTotalQueryRequset));
         BizResultVO<CustIncomeTotalVO> bizResultVO = new BizResultVO<>();
  
         BizResult<CustIncomeTotalDTO> result = cusIncomeService.queryCustIncomeTotal(custIncomeTotalQueryRequset);
@@ -110,13 +111,13 @@ public class IndexPageStatisticController extends BizController {
         vo.setPayedTotalAmount(result.getData().getPayedTotalAmount().setScale(2, BigDecimal.ROUND_HALF_UP).toString());
  
         bizResultVO.setData(vo);
-
+        logger.info("---end企业云平台首页-实际收入查询");
         return bizResultVO;
     }
  
     /**
      * 云平台首页－>企业客户负责某个停车收入情况.<br/>
-     *
+     * 
      * @return
      * @throws Exception
      */
@@ -172,57 +173,20 @@ public class IndexPageStatisticController extends BizController {
  
     /**
      * 云平台首页－>企业客户负责某个停车不同的支付方式收入情况.<br/>
-     *
+     * 说明:
+     *  1.2017-08-22将支付方式更改为饼图.<br/>
      * @return
      * @throws Exception
      */
     @ApiOperation("企业客户负责某个停车不同的支付方式收入情况")
     @PostMapping("/queryCustIncomeForPayType")
-    public BizResultVO<CustIncomeForPayTypeResVO> queryCustIncomeForPayType(
+    public BizResultVO<List<CustIncomeForPayTypeDTO>> queryCustIncomeForPayType(
         @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception {
-        logger.info("调用后场dubbo服务,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
+        logger.info("...begin企业客户负责某个停车不同的支付方式收入情况,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
         BizResult<List<CustIncomeForPayTypeDTO>> result = cusIncomeService.queryCustIncomeForPayType(
             custIncomeTotalQueryRequset);
-
-        logger.info("调用后场dubbo服务,响应为: result={}", JSONObject.toJSONString(result));
-        //如果不成功
-        if (!ResultUtils.isSuccess(result)) {
-            return new BizResultVO<>(result.getErrCode(), result.getErrMsg());
-        }
-        List<CustIncomeForPayTypeDTO> data = result.getData();
-
-        CustIncomeForPayTypeResVO res = new CustIncomeForPayTypeResVO();
-        res.addLegendData("费用", "占比");
-
-        BigDecimal total = BigDecimal.ZERO;
-        List<String> amount = new ArrayList<>();
-        for (CustIncomeForPayTypeDTO dto : data) {
-            //添加X轴数据
-            res.addXAxisData(dto.getPayTypeName());
-            total = total.add(dto.getPayedTotalAmount());
-            logger.info("返回的类型 和 数据为: payTypeName={},payedTotalAmount={},total={}", dto.getPayTypeName(),
-                dto.getPayedTotalAmount().toString(), total.toString());
-            amount.add(dto.getPayedTotalAmount().setScale(2, BigDecimal.ROUND_HALF_UP)
-                .doubleValue() + "");
-        }
-        //计算占比
-        List<String> zb = new ArrayList<>();
-        for (CustIncomeForPayTypeDTO dto : data) {
-            logger.info("计算占比 total={}", total.toString());
-            if (BigDecimal.ZERO.equals(total) || total.doubleValue() == 0.00) {
-                zb.add("0.00");
-            } else {
-                zb.add(dto.getPayedTotalAmount().divide(total, 4, RoundingMode.HALF_UP)
-                    .multiply(new BigDecimal("100.00")).doubleValue() + "");
-            }
-
-        }
-        res.addChildData("费用", amount);
-        res.addChildData("占比", zb);
-        BizResultVO<CustIncomeForPayTypeResVO> resResult = new BizResultVO<>();
-        resResult.setData(res);
-        logger.info("返回到前台的数据为: res={}", JSONObject.toJSONString(res));
-        return resResult;
+        logger.info("...end企业客户负责某个停车不同的支付方式收入情况,响应为: result={}", JSONObject.toJSONString(result));
+        return new BizResultVO<List<CustIncomeForPayTypeDTO>>(result);
     }
  
     /**
@@ -475,10 +439,20 @@ public class IndexPageStatisticController extends BizController {
         }
     }
  
-    public static void main(String[] args) {
-        BigDecimal m = BigDecimal.ZERO;
-        BigDecimal n = m.add(BigDecimal.TEN);
-        System.out.println(new BigDecimal("00.0").doubleValue() == 0);
+    /**
+	 * 企业云平台首页-->停车次数统计(饼图).<br/>
+	 * 说明:从订单表中统计(逃逸，免费，月卡年卡，临时)停车次数.<br/>
+	 * @param custIncomeTotalQueryRequset
+	 * @return
+	 * @throws Exception
+	 */
+    @ApiOperation("企业云平台首页-->停车次数统计(饼图)")
+    @PostMapping("/queryParingCount")
+    public BizResultVO<List<ParkingCountDTO>> queryParingCount(@RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception{
+    	logger.info("...begin停车次数统计->调用后场dubbo服务,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
+    	BizResult<List<ParkingCountDTO>> result =cusIncomeService.queryParingCount(custIncomeTotalQueryRequset);
+    	logger.info("...end停车次数统计->调用后场dubbo服务...");
+    	return new BizResultVO<List<ParkingCountDTO>>(result);
     }
  
 }