Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_back into dev-mata-ldz

src/main/java/com/izouma/nineth/repo/nftdomain/DomainAskRepo.java

@@ -29,6 +29,9 @@ public interface DomainAskRepo extends JpaRepository<DomainAsk, Long>, JpaSpecif
     @Query(nativeQuery = true, value = "select count(da.id) count,da.pic_url pic,da.domain_order_id domainOrderId,a.id assetId,da.`name` picName,da.end_time endTime from domain_ask da inner join asset a on a.id = da.asset_id where da.status in ('REFUNDED','ASKING','FINISH') and da.owner_id = ?1 and a.status = 'NORMAL' group by da.asset_id order by a.created_at desc")
     List<Map<String, Object>> askGroup(Long userId);
 
+    @Query(value = "select sum(price) from DomainAsk where status <> 'CANCELLED' and createdAt <= ?1 and createdAt >= ?2")
+    BigDecimal sumToday(LocalDateTime start, LocalDateTime end);
+
     int countByAssetIdAndUserIdAndStatusInAndDelFalse(Long assetId, Long userId, Set<DomainAskStatus> statuses);
 
     int countByAssetIdAndOwnerIdAndStatusInAndDelFalse(Long assetId, Long userId, Set<DomainAskStatus> statuses);

src/main/java/com/izouma/nineth/service/StatisticService.java

@@ -8,12 +8,14 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.izouma.nineth.config.GeneralProperties;
 import com.izouma.nineth.domain.*;
 import com.izouma.nineth.domain.Collection;
+import com.izouma.nineth.domain.nftdomain.DomainAsk;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.dto.excel.GlobalSearchDTO;
 import com.izouma.nineth.dto.nftdomain.CollectionDTO;
 import com.izouma.nineth.enums.*;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.*;
+import com.izouma.nineth.repo.nftdomain.DomainAskRepo;
 import com.izouma.nineth.utils.netease.CheckSumBuilder;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.RandomStringUtils;
@@ -50,6 +52,7 @@ public class StatisticService {
     private MintActivityService mintActivityService;
     private UserService         userService;
     private ShowroomService     showroomService;
+    private DomainAskRepo       domainAskRepo;
 
     public Map<String, Object> total(Long userId, Long companyId) {
         User user1 = userRepo.findByIdAndDelFalse(userId).orElseThrow(new BusinessException("无用户"));
@@ -470,7 +473,8 @@ public class StatisticService {
         BigDecimal todaySc = scs.stream().reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
         today.put("serviceCharge", todaySc);
         //域名
-        BigDecimal domainOrder1 = Optional.ofNullable(domainOrderRepo.sumToday(todayStart, todayEnd)).orElse(BigDecimal.ZERO);
+        BigDecimal domainOrder1 = Optional.ofNullable(domainOrderRepo.sumToday(todayStart, todayEnd))
+                                          .orElse(BigDecimal.ZERO);
         BigDecimal domainTotal = domainOrder.stream().map(Order::getTotalPrice).reduce(BigDecimal::add)
                                             .orElse(BigDecimal.ZERO);
         Long count = domainOrderRepo.countToday(todayStart, todayEnd);
@@ -481,6 +485,8 @@ public class StatisticService {
         today.put("domainOrder", Optional.of(domainOrder1.add(domainTotal)).orElse(BigDecimal.ZERO));
         today.put("domainOrderMonth", Optional.ofNullable(domainOrderMonth).orElse(BigDecimal.ZERO));
         today.put("countMonth", Optional.ofNullable(countMonth).orElse(0L));
+        today.put("ask", Optional.ofNullable(domainAskRepo.sumToday(todayEnd, todayStart)).orElse(BigDecimal.ZERO));
+
         //saas
         BigDecimal saas = orderRepo.sumSaas(todayStart, todayEnd);
         today.put("saas", Optional.ofNullable(saas).orElse(BigDecimal.ZERO));

src/main/vue/src/router.js

@@ -2086,6 +2086,14 @@ const router = new Router({
                        title: '元宇宙奖励空投编辑',
                     },
                 },
+                {
+                    path: '/domainAskList',
+                    name: 'DomainAskList',
+                    component: () => import(/* webpackChunkName: "domainAskList" */ '@/views/DomainAskList.vue'),
+                    meta: {
+                        title: '叫价列表',
+                    },
+                },
                 {
                     path: '/metaAwardDropList',
                     name: 'MetaAwardDropList',
@@ -2153,4 +2161,4 @@ router.beforeEach((to, from, next) => {
     }
 });
 
-export default router;
+export default router;

src/main/vue/src/views/DomainAskList.vue

@@ -1,9 +1,9 @@
 <template>
     <div  class="list-view">
         <page-title>
-            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading" class="filter-item">
-                新增
-            </el-button>
+<!--            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading" class="filter-item">-->
+<!--                新增-->
+<!--            </el-button>-->
             <el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData" class="filter-item">
                 导出
             </el-button>
@@ -79,16 +79,16 @@
                     <el-table-column prop="serviceCharge" label="手续费"
 >
                     </el-table-column>
-            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    width="150">
-                <template slot-scope="{row}">
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
-                </template>
-            </el-table-column>
+<!--            <el-table-column-->
+<!--                    label="操作"-->
+<!--                    align="center"-->
+<!--                    fixed="right"-->
+<!--                    width="150">-->
+<!--                <template slot-scope="{row}">-->
+<!--                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>-->
+<!--                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>-->
+<!--                </template>-->
+<!--            </el-table-column>-->
         </el-table>
         <div class="pagination-wrapper">
             <!-- <div class="multiple-mode-wrapper">
@@ -174,7 +174,7 @@
             download() {
                 this.downloading = true;
                 this.$axios
-                    .get("/domainAsk/excel", { 
+                    .get("/domainAsk/excel", {
                         responseType: "blob",
                         params: { size: 10000 }
                     })

src/main/vue/src/widgets/Detail.vue

@@ -40,6 +40,7 @@
                     <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-column align="center" prop="ask" label="叫价"> </el-table-column>
                 </el-table>
             </div>
             <canvas ref="chart" class="chart"></canvas>