查询用户得注册量以及商家入驻量

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/TeamInvitePageParam.java

@@ -19,5 +19,7 @@ public class TeamInvitePageParam implements Serializable {
     //类型：1-用户；2-商家；不传值-查所有
     private Integer type;
 
+    private Integer sourceType;
+
     private Paging paging;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/MerchantService.java

@@ -153,6 +153,15 @@ public interface MerchantService {
      */
     void merchantAudit(Long id, MerchantStatus status);
 
+
+    /**
+     * 获取商家入驻统计
+     * @param year 查询年期
+     * @param month 查询月份
+     * @return
+     */
+    List<Map<String,Object>> getMerchantReport(Integer year,Integer month);
+
 }
 
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/MerchantMapper.java

@@ -127,4 +127,13 @@ public interface MerchantMapper extends BaseMapper<Merchant> {
      * @return 经营报表信息
      */
     List<Map<String,Object>> operatReportByMonth(@Param("merchantId")Long merchantId,@Param("year")Integer year,@Param("month")Integer month);
+
+
+    /**
+     * 获取商家入驻统计
+     * @param year 查询年期
+     * @param month 查询月份
+     * @return
+     */
+    List<Map<String,Object>> getMerchantReport(@Param("year") Integer year, @Param("month") Integer month);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantServiceImpl.java

@@ -467,4 +467,9 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
         this.updateById(merchant);
     }
 
+    @Override
+    public List<Map<String,Object>> getMerchantReport(Integer year,Integer month){
+        return this.baseMapper.getMerchantReport(year,month);
+    }
+
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserInviteServiceImpl.java

@@ -162,6 +162,7 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
 
     @Override
     public TeamDTO inviteList(TeamInvitePageParam param) {
+        param.setType(param.getSourceType());
         TeamDTO dto = new TeamDTO();
         Paging paging = param.getPaging();
         int pageNum = (paging.getNumber() - 1) * paging.getSize();
@@ -172,6 +173,9 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
         if(CollectionUtils.isEmpty(records)){
             return dto;
         }
+        List<Long> userList = records.stream().map(TeamDetailsDTO::getUserId).collect(Collectors.toList());
+        List<UserDTO> usersLists = this.userService.listUsers(userList);
+        Map<Long, String> userMap = usersLists.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getNickname));
         Map<Long, String> map = new HashMap<>();
         if(param.getType() == null){
             List<Long> userIds = records.stream().filter(e -> e.getSourceType() == 1).map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
@@ -191,6 +195,7 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
         }
         for(TeamDetailsDTO detailsDTO : records){
             detailsDTO.setName(map.get(detailsDTO.getInviteUserId()));
+            detailsDTO.setNickname(userMap.get(detailsDTO.getUserId()));
             BigDecimal amount = detailsDTO.getAmount();
             if(amount == null){
                 detailsDTO.setAmount(BigDecimal.ZERO);

vehicle-server/src/main/resources/mapper/MerchantMapper.xml

@@ -299,4 +299,33 @@
 
     </select>
 
+
+
+
+    <select id="getMerchantReport" resultType="java.util.Map">
+        SELECT
+            count( 0 ),
+            t.DAY
+        FROM
+            (
+                SELECT YEAR
+                    ( create_time ) YEAR,
+                    MONTH ( create_time ) MONTH,
+                    DAY ( create_time ) DAY,
+                    create_time,
+                    count( 0 ) count
+                FROM
+                    `merchant`
+                WHERE
+                    MONTH ( create_time ) = #{month}
+                  AND YEAR ( create_time ) = #{year}
+                GROUP BY
+                    DAY ( create_time ),
+                    create_time,
+                    YEAR ( create_time ),
+                    MONTH ( create_time )) t
+        GROUP BY
+            t.DAY
+    </select>
+
 </mapper>