|
@@ -1,5 +1,6 @@
|
|
|
package com.java110.report.cmd.dataReport;
|
|
package com.java110.report.cmd.dataReport;
|
|
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.java110.core.annotation.Java110Cmd;
|
|
import com.java110.core.annotation.Java110Cmd;
|
|
|
import com.java110.core.context.ICmdDataFlowContext;
|
|
import com.java110.core.context.ICmdDataFlowContext;
|
|
@@ -50,31 +51,88 @@ public class QueryFeeDataReportCmd extends Cmd {
|
|
|
queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
|
|
queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
|
|
|
queryStatisticsDto.setCommunityId(reqJson.getString("communityId"));
|
|
queryStatisticsDto.setCommunityId(reqJson.getString("communityId"));
|
|
|
|
|
|
|
|
- JSONObject data = new JSONObject();
|
|
|
|
|
|
|
+ JSONArray datas = new JSONArray();
|
|
|
|
|
+ JSONObject data = null;
|
|
|
|
|
|
|
|
// todo 查询 实收金额
|
|
// todo 查询 实收金额
|
|
|
double receivedFee = feeStatisticsImpl.getReceivedFee(queryStatisticsDto);
|
|
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 查询 优惠金额
|
|
// todo 查询 优惠金额
|
|
|
double discountFee = feeStatisticsImpl.getDiscountFee(queryStatisticsDto);
|
|
double discountFee = feeStatisticsImpl.getDiscountFee(queryStatisticsDto);
|
|
|
- data.put("discountFee", discountFee);
|
|
|
|
|
|
|
+ data = new JSONObject();
|
|
|
|
|
+ data.put("name","优惠金额");
|
|
|
|
|
+ data.put("value", discountFee);
|
|
|
|
|
+ datas.add(data);
|
|
|
|
|
|
|
|
// todo 查询 滞纳金
|
|
// todo 查询 滞纳金
|
|
|
double lateFee = feeStatisticsImpl.getLateFee(queryStatisticsDto);
|
|
double lateFee = feeStatisticsImpl.getLateFee(queryStatisticsDto);
|
|
|
- data.put("lateFee", lateFee);
|
|
|
|
|
|
|
+ data = new JSONObject();
|
|
|
|
|
+ data.put("name","滞纳金");
|
|
|
|
|
+ data.put("value", lateFee);
|
|
|
|
|
+ datas.add(data);
|
|
|
|
|
|
|
|
// todo 查询 账户预存
|
|
// todo 查询 账户预存
|
|
|
|
|
+ double prestoreAccount = feeStatisticsImpl.getPrestoreAccount(queryStatisticsDto);
|
|
|
|
|
+ data = new JSONObject();
|
|
|
|
|
+ data.put("name","账户预存");
|
|
|
|
|
+ data.put("value", prestoreAccount);
|
|
|
|
|
+ datas.add(data);
|
|
|
|
|
+
|
|
|
// todo 查询 账户扣款
|
|
// todo 查询 账户扣款
|
|
|
|
|
+ double withholdAccount = feeStatisticsImpl.getWithholdAccount(queryStatisticsDto);
|
|
|
|
|
+ data = new JSONObject();
|
|
|
|
|
+ data.put("name","账户扣款");
|
|
|
|
|
+ data.put("value", withholdAccount);
|
|
|
|
|
+ datas.add(data);
|
|
|
|
|
+
|
|
|
// todo 查询 临时车收入
|
|
// todo 查询 临时车收入
|
|
|
|
|
+ double tempCarFee = feeStatisticsImpl.getTempCarFee(queryStatisticsDto);
|
|
|
|
|
+ data = new JSONObject();
|
|
|
|
|
+ data.put("name","临时车收入");
|
|
|
|
|
+ data.put("value", tempCarFee);
|
|
|
|
|
+ datas.add(data);
|
|
|
|
|
+
|
|
|
// todo 查询 押金退款
|
|
// todo 查询 押金退款
|
|
|
|
|
+ double refundDeposit = feeStatisticsImpl.geRefundDeposit(queryStatisticsDto);
|
|
|
|
|
+ data = new JSONObject();
|
|
|
|
|
+ data.put("name","押金退款");
|
|
|
|
|
+ data.put("value", refundDeposit);
|
|
|
|
|
+ datas.add(data);
|
|
|
|
|
+
|
|
|
// todo 查询 退款订单数
|
|
// todo 查询 退款订单数
|
|
|
|
|
+ double refundOrderCount = feeStatisticsImpl.geRefundOrderCount(queryStatisticsDto);
|
|
|
|
|
+ data = new JSONObject();
|
|
|
|
|
+ data.put("name","退款订单数");
|
|
|
|
|
+ data.put("value", refundOrderCount);
|
|
|
|
|
+ datas.add(data);
|
|
|
// todo 查询 退款金额
|
|
// todo 查询 退款金额
|
|
|
- // 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);
|
|
|
|
|
+
|
|
|
|
|
|
|
|
- context.setResponseEntity(ResultVo.createResponseEntity(data));
|
|
|
|
|
|
|
+ context.setResponseEntity(ResultVo.createResponseEntity(datas));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|