From bd72b193becb5770c2ba7dd0580d46428def7a03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 29 五月 2023 17:00:57 +0800
Subject: [PATCH] optmize
---
service-report/src/main/java/com/java110/report/cmd/dataReport/QueryFeeDataReportCmd.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 106 insertions(+), 12 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 6e933a1..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,12 +1,18 @@
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.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 java.text.ParseException;
@@ -15,6 +21,13 @@
*/
@Java110Cmd(serviceCode = "dataReport.queryFeeDataReport")
public class QueryFeeDataReportCmd extends Cmd {
+
+ @Autowired
+ private IFeeStatistics feeStatisticsImpl;
+
+ @Autowired
+ private IOrderStatistics orderStatisticsImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖�");
@@ -22,31 +35,112 @@
Assert.hasKeyAndValue(reqJson, "endDate", "鏈寘鍚粨鏉熸椂闂�");
String startDate = reqJson.getString("startDate");
String endDate = reqJson.getString("endDate");
- if(!startDate.contains(":")){
+ if (!startDate.contains(":")) {
startDate += " 00:00:00";
- reqJson.put("startDate",startDate);
+ reqJson.put("startDate", startDate);
}
- if(!endDate.contains(":")){
+ if (!endDate.contains(":")) {
endDate += " 23:59:59";
- reqJson.put("endDate",endDate);
+ reqJson.put("endDate", endDate);
}
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+ QueryStatisticsDto queryStatisticsDto = new QueryStatisticsDto();
+ queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
+ queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
+ queryStatisticsDto.setCommunityId(reqJson.getString("communityId"));
+
+ JSONArray datas = new JSONArray();
+ JSONObject data = null;
// todo 鏌ヨ 瀹炴敹閲戦
- // todo 鏌ヨ 浼樻儬閲戦
- // todo 鏌ヨ 婊炵撼閲�
- // todo 鏌ヨ 璐︽埛棰勫瓨
- // todo 鏌ヨ 璐︽埛鎵ｆ
- // todo 鏌ヨ 涓存椂杞︽敹鍏�
- // todo 鏌ヨ 鎶奸噾閫�娆�
- // todo 鏌ヨ 閫�娆捐鍗曟暟
- // todo 鏌ヨ 閫�娆鹃噾棰�
+ double receivedFee = feeStatisticsImpl.getReceivedFee(queryStatisticsDto);
+ 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 = new JSONObject();
+ data.put("name","浼樻儬閲戦");
+ data.put("value", discountFee);
+ datas.add(data);
+
+ // todo 鏌ヨ 婊炵撼閲�
+ double lateFee = feeStatisticsImpl.getLateFee(queryStatisticsDto);
+ 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 鏌ヨ 閫�娆鹃噾棰�
+ 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(datas));
}
}
--
Gitblit v1.8.0