From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/cmd/dataReport/QueryFeeDataReportCmd.java | 86 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 76 insertions(+), 10 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryFeeDataReportCmd.java b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryFeeDataReportCmd.java
index 5ddf0d6..5b02ed1 100644
--- a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryFeeDataReportCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryFeeDataReportCmd.java
@@ -1,21 +1,20 @@
package com.java110.report.cmd.dataReport;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.report.QueryStatisticsDto;
-import com.java110.report.statistics.IBaseDataStatistics;
import com.java110.report.statistics.IFeeStatistics;
+import com.java110.report.statistics.IOrderStatistics;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import javax.xml.ws.Action;
import java.text.ParseException;
-import java.util.List;
/**
* 鏌ヨ璐圭敤绫荤粺璁�
@@ -25,6 +24,9 @@
@Autowired
private IFeeStatistics feeStatisticsImpl;
+
+ @Autowired
+ private IOrderStatistics orderStatisticsImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -50,31 +52,95 @@
queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
queryStatisticsDto.setCommunityId(reqJson.getString("communityId"));
- JSONObject data = new JSONObject();
+ JSONArray datas = new JSONArray();
+ JSONObject data = null;
// todo 鏌ヨ 瀹炴敹閲戦
double receivedFee = feeStatisticsImpl.getReceivedFee(queryStatisticsDto);
- data.put("receivedFee", receivedFee);
+ data = new JSONObject();
+ data.put("name","瀹炴敹閲戦");
+ data.put("value", receivedFee);
+ datas.add(data);
+
+ // todo 鏌ヨ 娆犺垂閲戦
+ double oweFee = feeStatisticsImpl.getOweFee(queryStatisticsDto);
+ data = new JSONObject();
+ data.put("name","娆犺垂閲戦");
+ data.put("value", oweFee);
+ datas.add(data);
// todo 鏌ヨ 浼樻儬閲戦
double discountFee = feeStatisticsImpl.getDiscountFee(queryStatisticsDto);
- data.put("discountFee", discountFee);
+ data = new JSONObject();
+ data.put("name","浼樻儬閲戦");
+ data.put("value", discountFee);
+ datas.add(data);
// todo 鏌ヨ 婊炵撼閲�
double lateFee = feeStatisticsImpl.getLateFee(queryStatisticsDto);
- data.put("lateFee", lateFee);
+ data = new JSONObject();
+ data.put("name","婊炵撼閲�");
+ data.put("value", lateFee);
+ datas.add(data);
// todo 鏌ヨ 璐︽埛棰勫瓨
+ double prestoreAccount = feeStatisticsImpl.getPrestoreAccount(queryStatisticsDto);
+ data = new JSONObject();
+ data.put("name","璐︽埛棰勫瓨");
+ data.put("value", prestoreAccount);
+ datas.add(data);
+
// todo 鏌ヨ 璐︽埛鎵ｆ
+ double withholdAccount = feeStatisticsImpl.getWithholdAccount(queryStatisticsDto);
+ data = new JSONObject();
+ data.put("name","璐︽埛鎵ｆ");
+ data.put("value", withholdAccount);
+ datas.add(data);
+
// todo 鏌ヨ 涓存椂杞︽敹鍏�
+ double tempCarFee = feeStatisticsImpl.getTempCarFee(queryStatisticsDto);
+ data = new JSONObject();
+ data.put("name","涓存椂杞︽敹鍏�");
+ data.put("value", tempCarFee);
+ datas.add(data);
+
// todo 鏌ヨ 鎶奸噾閫�娆�
+ double refundDeposit = feeStatisticsImpl.geRefundDeposit(queryStatisticsDto);
+ data = new JSONObject();
+ data.put("name","鎶奸噾閫�娆�");
+ data.put("value", refundDeposit);
+ datas.add(data);
+
// todo 鏌ヨ 閫�娆捐鍗曟暟
+ double refundOrderCount = feeStatisticsImpl.geRefundOrderCount(queryStatisticsDto);
+ data = new JSONObject();
+ data.put("name","閫�娆捐鍗曟暟");
+ data.put("value", refundOrderCount);
+ datas.add(data);
// todo 鏌ヨ 閫�娆鹃噾棰�
- // todo 鏌ヨ 娆犺垂閲戦
+ double refundFee = feeStatisticsImpl.geRefundFee(queryStatisticsDto);
+ data = new JSONObject();
+ data.put("name","閫�娆鹃噾棰�");
+ data.put("value", refundFee);
+ datas.add(data);
+
+
+
// todo 鏌ヨ 鍏呯數閲戦
+ double chargeFee = feeStatisticsImpl.getChargeFee(queryStatisticsDto);
+ data = new JSONObject();
+ data.put("name","鍏呯數閲戦");
+ data.put("value", chargeFee);
+ datas.add(data);
+
+ // todo 鏌ヨ 鏈堝崱閲戦
+ double chargeMonthOrderMoney = orderStatisticsImpl.getChargeMonthOrderCount(queryStatisticsDto);
+ data = new JSONObject();
+ data.put("name","鏈堝崱瀹炴敹");
+ data.put("value", chargeMonthOrderMoney);
+ datas.add(data);
-
- context.setResponseEntity(ResultVo.createResponseEntity(data));
+ context.setResponseEntity(ResultVo.createResponseEntity(datas));
}
}
--
Gitblit v1.8.0