工作台全年消费bug修复

src/main/java/com/example/demo/domain/vo/WorkbenchFullStatistics.java

@@ -24,6 +24,7 @@ public class WorkbenchFullStatistics implements Serializable {
     private Integer totalConsumePermanent;  //总消费-永久金币
     private Integer totalConsumeFree;   //总消费-免费金币
     private Integer totalConsumeTask;   //总消费-任务金币
+    private Integer totalConsume;   //总消费
     private Integer totalRefund;    //总退款
     private Integer totalRechargeNum;   //总充值人数
 }

src/main/java/com/example/demo/domain/vo/WorkbenchMarketGraph.java

@@ -26,4 +26,5 @@ public class WorkbenchMarketGraph implements Serializable {
     private Integer SumConsumePermanent; //合计消费永久金币
     private Integer SumConsumeFree; //合计消费免费金币
     private Integer SumConsumeTask; //合计消费任务金币
+    private Integer SumConsume; //合计消费金币
 }

src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java

@@ -203,6 +203,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
             graphs.setSumConsumePermanent(sums.get("cPermanent"));
             graphs.setSumConsumeFree(sums.get("cFree"));
             graphs.setSumConsumeTask(sums.get("cTask"));
+            graphs.setSumConsume(sums.get("consume"));
             marketGraphs.add(graphs);
         }
         return new WorkbenchCard(token, new ArrayList<>(),marketGraphs,markets,startDate,endDate);
@@ -222,6 +223,9 @@ public class WorkbenchServiceImpl implements WorkbenchService {
         result.put("cPermanent", stats.getTotalConsumePermanent() != null ? stats.getTotalConsumePermanent() : 0);
         result.put("cFree", stats.getTotalConsumeFree() != null ? stats.getTotalConsumeFree() : 0);
         result.put("cTask", stats.getTotalConsumeTask() != null ? stats.getTotalConsumeTask() : 0);
+        result.put("consume",(stats.getTotalConsumePermanent() != null ? stats.getTotalConsumePermanent() : 0)
+        +(stats.getTotalConsumeFree() != null ? stats.getTotalConsumeFree() : 0)
+        +(stats.getTotalConsumeTask() != null ? stats.getTotalConsumeTask() : 0));
         result.put("refund", stats.getTotalRefund() != null ? stats.getTotalRefund() : 0);
         result.put("rechargeNum", stats.getTotalRechargeNum() != null ? stats.getTotalRechargeNum() : 0);
         return result;