浏览代码

Merge branch 'feature/pool0109_company_seller' into debug

xyxie 1 年之前
父节点
当前提交
49bef7fde9
共有 2 个文件被更改,包括 4 次插入0 次删除
  1. 2 0
      services/statistic_report/company.go
  2. 2 0
      services/statistic_report/reponse.go

+ 2 - 0
services/statistic_report/company.go

@@ -555,6 +555,8 @@ func CompanyList(sysUser *system.Admin, req statisticModels.IncrementalCompanyLi
 				Deadline:        tmpDeadline,
 				Deadline:        tmpDeadline,
 				IsShow:          isShow,
 				IsShow:          isShow,
 				TryStageSlice:   tryStageSlice,
 				TryStageSlice:   tryStageSlice,
+				ShareSellerId:   v.ShareSellerId,
+				ShareSeller:     v.ShareSeller,
 			}
 			}
 			if strings.Contains(companyList.ApproveStatus, "已审批") {
 			if strings.Contains(companyList.ApproveStatus, "已审批") {
 				companyList.ApproveStatus = ""
 				companyList.ApproveStatus = ""

+ 2 - 0
services/statistic_report/reponse.go

@@ -148,6 +148,8 @@ type CompanyListItem struct {
 	TryStageSlice    []company.TryStageSliceItem `description:"试用状态相关"`
 	TryStageSlice    []company.TryStageSliceItem `description:"试用状态相关"`
 	FiccTryOutDay    int                         `description:"Ficc总试用天数"`
 	FiccTryOutDay    int                         `description:"Ficc总试用天数"`
 	RaiTryOutDay     int                         `description:"权益总试用天数"`
 	RaiTryOutDay     int                         `description:"权益总试用天数"`
+	ShareSellerId    int                         `description:"分配的咨询组销售ID"`
+	ShareSeller      string                      `description:"分配的咨询组销售名称"`
 }
 }
 
 
 // CompanyRenewRecordResp 总统计信息
 // CompanyRenewRecordResp 总统计信息