Merge branch 'dev' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/domain/MintRank.java

@@ -0,0 +1,26 @@
+package com.izouma.nineth.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class MintRank extends BaseEntity{
+
+    @ApiModelProperty("用户名称")
+    private String nickname;
+
+    @ApiModelProperty("头像")
+    private String avatar;
+
+    @ApiModelProperty("数量")
+    private int num;
+}

src/main/java/com/izouma/nineth/repo/MintOrderRepo.java

@@ -10,6 +10,7 @@ import org.springframework.data.jpa.repository.Query;
 import javax.transaction.Transactional;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 public interface MintOrderRepo extends JpaRepository<MintOrder, Long>, JpaSpecificationExecutor<MintOrder> {
     @Query("update MintOrder t set t.del = true where t.id = ?1")
@@ -24,4 +25,7 @@ public interface MintOrderRepo extends JpaRepository<MintOrder, Long>, JpaSpecif
     List<MintOrder> findByStatusAndCreatedAtAfterOrderByCreatedAtDesc(MintOrderStatus status, LocalDateTime time);
 
     List<MintOrder> findByMintActivityIdAndStatusOrderById(Long id, MintOrderStatus status);
+
+    @Query(value = "select user.nickname nickname,user.avatar avatar,count(mint_order.user_id) num from mint_order inner join user on mint_order.user_id = user.id where mint_order.mint_activity_id = 8843217 and mint_order.status = 'FINISH' group by mint_order.user_id order by count(mint_order.user_id) desc", nativeQuery = true)
+    List<Map<String,Object>> findMintRank();
 }

src/main/java/com/izouma/nineth/web/MintOrderController.java

@@ -1,9 +1,11 @@
 package com.izouma.nineth.web;
 
+import com.alibaba.fastjson.JSONArray;
 import com.izouma.nineth.converter.LongArrayConverter;
 import com.izouma.nineth.domain.MintActivity;
 import com.izouma.nineth.domain.MintMaterial;
 import com.izouma.nineth.domain.MintOrder;
+import com.izouma.nineth.domain.MintRank;
 import com.izouma.nineth.dto.MintOrderDTO;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
@@ -144,5 +146,14 @@ public class MintOrderController extends BaseController {
         mintOrderService.orderAudit(id, false);
     }
 
+    @GetMapping("/mintRank")
+    public List<MintRank> mintRank(){
+        List<Map<String, Object>> map = mintOrderRepo.findMintRank();
+        JSONArray jsonArray = new JSONArray();
+        jsonArray.addAll(map);
+        List<MintRank> mintRanks = jsonArray.toJavaList(MintRank.class);
+        return mintRanks;
+    }
+
 }