optmize

service-report/src/main/java/com/java110/report/cmd/dataReport/QueryFeeDataReportCmd.java

@@ -9,6 +9,7 @@ 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;
@@ -27,6 +28,9 @@ 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", "未包含小区");
@@ -132,6 +136,13 @@ public class QueryFeeDataReportCmd extends Cmd {
         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));
     }

service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOrderDataReportCmd.java

@@ -148,12 +148,7 @@ public class QueryOrderDataReportCmd extends Cmd {
         data.put("value", chargeMachineOrderCount);
         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));