wangqifan 3 سال پیش
والد
کامیت
089eae3f65
2فایلهای تغییر یافته به همراه4 افزوده شده و 1 حذف شده
  1. 1 1
      src/main/java/com/izouma/nineth/service/StatisticService.java
  2. 3 0
      src/main/vue/src/widgets/Detail.vue

+ 1 - 1
src/main/java/com/izouma/nineth/service/StatisticService.java

@@ -470,7 +470,7 @@ public class StatisticService {
         BigDecimal todaySc = scs.stream().reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
         BigDecimal todaySc = scs.stream().reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
         today.put("serviceCharge", todaySc);
         today.put("serviceCharge", todaySc);
         //域名
         //域名
-        BigDecimal domainOrder1 = domainOrderRepo.sumToday(todayStart, todayEnd);
+        BigDecimal domainOrder1 = Optional.ofNullable(domainOrderRepo.sumToday(todayStart, todayEnd)).orElse(BigDecimal.ZERO);
         BigDecimal domainTotal = domainOrder.stream().map(Order::getTotalPrice).reduce(BigDecimal::add)
         BigDecimal domainTotal = domainOrder.stream().map(Order::getTotalPrice).reduce(BigDecimal::add)
                                             .orElse(BigDecimal.ZERO);
                                             .orElse(BigDecimal.ZERO);
         Long count = domainOrderRepo.countToday(todayStart, todayEnd);
         Long count = domainOrderRepo.countToday(todayStart, todayEnd);

+ 3 - 0
src/main/vue/src/widgets/Detail.vue

@@ -37,6 +37,9 @@
                     <el-table-column align="center" prop="royalties" label="版权费"> </el-table-column>
                     <el-table-column align="center" prop="royalties" label="版权费"> </el-table-column>
                     <el-table-column align="center" prop="recharge" label="充值"> </el-table-column>
                     <el-table-column align="center" prop="recharge" label="充值"> </el-table-column>
                     <el-table-column align="center" prop="withdraw" label="提现"> </el-table-column>
                     <el-table-column align="center" prop="withdraw" label="提现"> </el-table-column>
+                    <el-table-column align="center" prop="domainOrderMonth" label="本月域名"> </el-table-column>
+                    <el-table-column align="center" prop="domainCount" label="域名注册"> </el-table-column>
+                    <el-table-column align="center" prop="countMonth" label="本月注册"> </el-table-column>
                 </el-table>
                 </el-table>
             </div>
             </div>
             <canvas ref="chart" class="chart"></canvas>
             <canvas ref="chart" class="chart"></canvas>