Merge branch 'crm/crm_BusinessCardUrl' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_user.go

@@ -16,6 +16,7 @@ import (
 	"hongze/hz_crm_api/models/system"
 	"hongze/hz_crm_api/models/yb"
 	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/services/alarm_msg"
 	cygxService "hongze/hz_crm_api/services/cygx"
 	"hongze/hz_crm_api/services/elastic"
 	"hongze/hz_crm_api/utils"
@@ -1610,6 +1611,11 @@ func (this *CompanyUserController) EditUser() {
 		br.Msg = "获取信息失败"
 		return
 	}
+	//如果用户已经存在名片的情况下，但是二次编辑的时候前端没传名片信息，那么名片信息不做任何变更，并发送异常信息提醒
+	if wxUser.BusinessCardUrl != "" && req.BusinessCardUrl == "" {
+		req.BusinessCardUrl = wxUser.BusinessCardUrl
+		go alarm_msg.SendAlarmMsg(fmt.Sprint("用户已经存在名片的情况下，但是二次编辑的时候前端没传名片信息。操作销售:", sysUser.RealName, "被操作UserId:", req.UserId), 3)
+	}
 
 	//获取当前操作员产品权限
 	companyProductList, productErr := getSysCompanyProductList(productId, wxUser.CompanyId)
@@ -6259,3 +6265,39 @@ func (this *CompanyUserController) UpadteUserYanxuanPermission() {
 	br.Success = true
 	br.Msg = "操作成功"
 }
+
+// @Title 客户联系人详情
+// @Description 客户联系人详情接口
+// @Param   UserId  query  int	  true  "用户ID"
+// @router /user/detail [get]
+func (this *CompanyUserController) DetailUser() {
+	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
+	}
+	userId, _ := this.GetInt("UserId")
+	if userId <= 0 {
+		br.Msg = "参数错误！"
+		return
+	}
+	wxUser, err := models.GetWxUserByUserId(userId)
+	if err != nil {
+		br.ErrMsg = "获取信息失败，Err:" + err.Error()
+		br.Msg = "获取信息失败"
+		return
+	}
+	resp := new(models.WxUserResp)
+	resp.Detail = wxUser
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

models/wx_user.go

@@ -39,6 +39,11 @@ type WxUser struct {
 	RaiLastViewTime     string    `description:"权益报告的最近一次阅读时间"`
 }
 
+// 用户详情出参
+type WxUserResp struct {
+	Detail *WxUser
+}
+
 func AddWxUser(item *WxUser) (lastId int64, err error) {
 	o := orm.NewOrm()
 	lastId, err = o.Insert(item)
@@ -598,4 +603,4 @@ func GetCompanyFollowCount(companyId int) (count int, err error) {
 	sql := ` SELECT COUNT(1) FROM wx_user WHERE company_id=? AND is_follow = 1 `
 	err = o.Raw(sql, companyId).QueryRow(&count)
 	return
-}
+}

routers/commentsRouter.go

@@ -9826,6 +9826,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanyUserController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanyUserController"],
+        beego.ControllerComments{
+            Method: "DetailUser",
+            Router: `/user/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanyUserController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanyUserController"],
         beego.ControllerComments{
             Method: "EditUser",