ソースを参照

Merge branch 'cygx/mfyx_2.1' of http://8.136.199.33:3000/hongze/hz_crm_api

xingzai 11 ヶ月 前
コミット
e9ddb8e254

+ 139 - 0
controllers/cygx/user_admin_share_history.go

@@ -0,0 +1,139 @@
+package cygx
+
+import (
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/utils"
+	"strconv"
+)
+
+// 分享记录
+type UserAdminShareHistoryController struct {
+	controllers.BaseAuthController
+}
+
+// @Title 分享记录列表
+// @Description 分享记录列表接口
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码,从1开始"
+// @Param   StartDate   query   string  false       "开始时间 ,列如2021-03-06 "
+// @Param   EndDate   query   string  false       "结束时间,列如2021-03-06 "
+// @Param   AdminId   query   string  false       "销售ID "
+// @Param   KeyWord   query   string  false       "搜索关键词"
+// @Success Ret=200 {object} cygx.GetCygxUserAdminShareHistoryListResp
+// @router /mfyx/admin/share/list [get]
+func (this *UserAdminShareHistoryController) OrderList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录,SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	resp := new(cygx.GetCygxUserAdminShareHistoryListResp)
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+	startDate := this.GetString("StartDate")
+	endDate := this.GetString("EndDate")
+	adminId := this.GetString("AdminId")
+	keyWord := this.GetString("KeyWord")
+
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = utils.StartIndex(currentIndex, pageSize)
+	var condition string
+	var pars []interface{}
+
+	if startDate != "" && endDate != "" { //时间范围
+		startDate += " 00:00:00"
+		endDate += " 23:59:59"
+		condition += ` 	AND create_time  BETWEEN ?   AND  ? `
+		pars = append(pars, startDate, endDate)
+	}
+
+	if adminId != "" { //所属销售筛选
+		condition += ` 	AND share_id IN (` + adminId + `) `
+	}
+
+	if keyWord != "" { //用户姓名,手机号
+		keyWord = "%" + keyWord + "%"
+		condition += ` 	AND (mobile LIKE ?  OR  real_name LIKE ? ) `
+		pars = append(pars, keyWord, keyWord)
+	}
+
+	total, err := cygx.GetCygxUserAdminShareHistoryCount(condition, pars)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,Err:" + err.Error()
+		return
+	}
+	condition += "	ORDER BY user_admin_share_history_id  DESC "
+	list, err := cygx.GetCygxUserAdminShareHistoryList(condition, pars, startSize, pageSize)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,Err:" + err.Error()
+		return
+	}
+	var mobiles []string
+	for _, v := range list {
+		mobiles = append(mobiles, v.Mobile)
+	}
+	listUser, err := models.GetWxUserRaiSllerListByUserMobile(mobiles)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败,Err:" + err.Error()
+		return
+	}
+	//获取用户当前最新的公司信息
+	mapWxUserSller := make(map[string]*models.WxUserSller)
+	for _, v := range listUser {
+		mapWxUserSller[v.Mobile] = v
+	}
+
+	for _, v := range list {
+		switch v.Source {
+		case utils.CYGX_OBJ_ARTICLE: //文章详情
+			v.HttpUrl = utils.CYGX_MFYX_URL + "/material/info/" + strconv.Itoa(v.SourceId)
+		case utils.CYGX_OBJ_ACTIVITY: //活动详情
+			v.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
+		case utils.CYGX_OBJ_YANXUANSPECIAL: //研选专栏
+			v.HttpUrl = utils.CYGX_MFYX_URL + "/column/detail/" + strconv.Itoa(v.SourceId)
+		}
+
+		switch v.RegisterPlatform {
+		case 5:
+			v.RegisterPlatformText = "研选小程序"
+		case 6:
+			v.RegisterPlatformText = "研选网页版"
+		}
+		mapItem := mapWxUserSller[v.Mobile]
+		if mapItem != nil {
+			v.CompanyName = mapItem.CompanyName
+			v.CompanyId = mapItem.CompanyId
+			v.RealName = mapItem.RealName
+		} else {
+			v.RealName = "--"
+			v.CompanyName = "--"
+			v.CompanyId = 1
+		}
+	}
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp.Paging = page
+	resp.List = list
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

+ 76 - 0
models/cygx/user_admin_share_history.go

@@ -0,0 +1,76 @@
+package cygx
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"time"
+)
+
+type CygxUserAdminShareHistory struct {
+	UserAdminShareHistoryId int       `orm:"column(user_admin_share_history_id);pk";comment:"主键ID"`
+	Action                  string    `comment:"动作内容"`
+	UserId                  int       `comment:"用户ID"`
+	Mobile                  string    `comment:"手机号"`
+	Email                   string    `comment:"邮箱"`
+	CompanyId               int       `comment:"公司ID"`
+	CompanyName             string    `comment:"公司名称"`
+	RealName                string    `comment:"用户实际名称"`
+	SellerName              string    `comment:"所属销售名称"`
+	SellerId                int       `comment:"所属销售ID"`
+	ShareId                 int       `comment:"分享人ID"`
+	ShareName               string    `comment:"分享人姓名"`
+	Source                  string    `comment:"来源(article, activity, login)"`
+	SourceId                int       `comment:"来源 ID"`
+	SourceTitle             string    `comment:"来源名称,活动或者报告标题"`
+	RegisterPlatform        int       `comment:"注册平台(1: 小程序, 2: 网页)"`
+	CreateTime              time.Time `comment:"创建时间"`
+	ModifyTime              time.Time `comment:"修改时间"`
+}
+
+type CygxUserAdminShareHistoryResp struct {
+	UserAdminShareHistoryId int    `orm:"column(user_admin_share_history_id);pk";comment:"主键ID"`
+	Action                  string `comment:"动作内容"`
+	UserId                  int    `comment:"用户ID"`
+	Mobile                  string `comment:"手机号"`
+	Email                   string `comment:"邮箱"`
+	CompanyId               int    `comment:"公司ID"`
+	CompanyName             string `comment:"公司名称"`
+	RealName                string `comment:"用户实际名称"`
+	ShareId                 int    `comment:"分享人ID"`
+	ShareName               string `comment:"分享人姓名"`
+	Source                  string `comment:"来源(article, activity, login)"`
+	SourceId                int    `comment:"来源 ID"`
+	SourceTitle             string `comment:"来源名称,活动或者报告标题"`
+	RegisterPlatform        int    `comment:"注册平台(1: 小程序, 2: 网页)"`
+	RegisterPlatformText    string `comment:"注册平台(1: 小程序, 2: 网页)"`
+	CreateTime              string `comment:"创建时间"`
+	HttpUrl                 string `comment:"跳转地址"`
+}
+
+type GetCygxUserAdminShareHistoryListResp struct {
+	Paging *paging.PagingItem `description:"分页数据"`
+	List   []*CygxUserAdminShareHistoryResp
+}
+
+// 获取数量
+func GetCygxUserAdminShareHistoryCount(condition string, pars []interface{}) (count int, err error) {
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_user_admin_share_history as a WHERE 1= 1  `
+	if condition != "" {
+		sqlCount += condition
+	}
+	o := orm.NewOrmUsingDB("hz_cygx")
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}
+
+// 列表
+func GetCygxUserAdminShareHistoryList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxUserAdminShareHistoryResp, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT * FROM cygx_user_admin_share_history as a WHERE 1= 1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` LIMIT ?,?  `
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}

+ 9 - 0
routers/commentsRouter.go

@@ -2878,6 +2878,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserAdminShareHistoryController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserAdminShareHistoryController"],
+        beego.ControllerComments{
+            Method: "OrderList",
+            Router: `/mfyx/admin/share/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserController"],
         beego.ControllerComments{
             Method: "Add",

+ 1 - 0
routers/router.go

@@ -159,6 +159,7 @@ func init() {
 				&cygx.ContractAllocationController{},
 				&cygx.QuestionnaireController{},
 				&cygx.AskserieVideoController{},
+				&cygx.UserAdminShareHistoryController{},
 			),
 		),
 		web.NSNamespace("/advisory",

+ 3 - 0
utils/config.go

@@ -62,6 +62,7 @@ var (
 	WxMsgTemplateIdWithRoadshowDetailResult  string //路演->销售收到处理结果
 	WxMsgTemplateIdWithRoadshowDeleteNotice  string //路演->研究员收到活动删除通知
 	CYGX_WEB_URL                             string //查研观向web端网址
+	CYGX_MFYX_URL                            string //查研观向web端网址
 
 	WxMsgTemplateIdWithYbCommunityQuestion string // 研报小程序->问答社区回复通知
 	WxMsgTemplateIdWithSealApplyFinished   string // 用印申请-已签回通知
@@ -246,6 +247,7 @@ ZwIDAQAB
 		IndexNameArticleHistory = "cygx_article_history_v07_08"
 		IndexNameComprehensive = "cygx_comprehensive"
 		CYGX_WEB_URL = "https://web.hzinsights.com"
+		CYGX_MFYX_URL = "https://www.research-select.com"
 		TemplateCompanyApplyRedirectUrl = "https://ficc.hzinsights.com/approval/approval/list"
 
 		//同花顺正式地址
@@ -286,6 +288,7 @@ ZwIDAQAB
 		IndexNameArticleHistory = "cygx_article_history_v1"
 		IndexNameComprehensive = "cygx_comprehensive_test"
 		CYGX_WEB_URL = "https://clpttest.hzinsights.com"
+		CYGX_MFYX_URL = "http://test.research-select.com"
 
 		//同花顺测试地址
 		THS_SendUrl = `https://mtest.10jqka.com.cn/gateway/ps/syncNews`