Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!975

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/PromoterController.java

@@ -53,6 +53,10 @@ public class PromoterController extends BaseApiController {
         @ApiResponse(code = 200, message = "成功", response = ChannelOperDataVO.class)
     )
     public AjaxResult saleDetail(@Validated @RequestBody PromoterDataQueryParam param) {
+        Long channelId = SecurityUtils.getLoginUser().getChannelId();
+        if (param.getChannelId() == null) {
+            param.setChannelId(channelId);
+        }
         Channel channel = channelService.getById(param.getChannelId());
         if (channel == null) {
             return AjaxResult.error("推广员不存在");

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelOperDataVO.java

@@ -1,5 +1,7 @@
 package com.qs.mp.channel.domain.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -8,13 +10,21 @@ import lombok.Data;
  * @Date 2022/3/1
  */
 @Data
+@ApiModel("经营数据")
 public class ChannelOperDataVO {
+
+  @ApiModelProperty("销售额")
   long saleAmt; // 销售额
+  @ApiModelProperty("佣金收入")
   long commAmt; // 佣金收入
+  @ApiModelProperty("新增用户数")
   long newUserCnt; // 新增用户数
+  @ApiModelProperty("渠道名称")
   String name; // 渠道名称
+  @ApiModelProperty("手机号")
   String mobile; // 手机号
+  @ApiModelProperty("订单数")
   int orderCnt; // 订单数
-  
+  @ApiModelProperty("盲票销量")
   long ticketSaleCnt; // 盲票销量
 }