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

src/main/java/com/chelvc/cloud/admin/controller/UserController.java

@@ -7,6 +7,7 @@ import com.chelvc.cloud.uc.api.param.UserPagingParam;
 import com.chelvc.cloud.uc.api.service.UserService;
 import com.chelvc.cloud.vehicle.api.dto.HelpCategoryDTO;
 import com.chelvc.cloud.vehicle.api.param.HelpCategoryPagingParam;
+import com.chelvc.cloud.vehicle.api.service.MerchantService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 用户接口
@@ -29,6 +32,9 @@ public class UserController {
     @DubboReference
     private UserService userService;
 
+    @DubboReference
+    private MerchantService merchantService;
+
     /**
      * 获取个人信息
      *
@@ -51,4 +57,23 @@ public class UserController {
     public Pagination<UserDTO> getUserPaging(@Valid UserPagingParam param) {
         return this.userService.getUserPaging(param);
     }
+
+
+    /**
+     * 查询用户注册统计
+     *
+     * @return 用户统计
+     */
+    @GetMapping("/user/getRegisterReport")
+    public Map<String,Object> getUserRegisterReport(Integer year,Integer month) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("user",this.userService.getUserRegisterReport(year, month));
+        map.put("merchant",this.merchantService.getMerchantReport(year, month));
+        return map;
+    }
+
+
+
+
+
 }