Merge branch 'master' of http://git.shengws.com/zhangbj/scrm-go

controllers/kefu/tencent_usersig_api_controller.go

 	c.ServeSuccessJSON(returnData)
 	return
 }
+

controllers/members/members_controller.go

 	"SCRM/models"
 	"SCRM/service/member_service"
 	"SCRM/utils"
+	"encoding/json"
+	"fmt"
 	"reflect"
 	"time"
-    "fmt"
-	"encoding/json"
 
 	"github.com/astaxie/beego"
 )
 
 func MemberCtlRegistRouters() {
 	beego.Router("/api/members", &MembersAPIController{}, "get:GetMembers")
+	beego.Router("/api/members/all", &MembersAPIController{}, "get:GetAllMembers")
 	beego.Router("/api/member/create", &MembersAPIController{}, "Post:CreateMember")
 	beego.Router("/api/member/edit", &MembersAPIController{}, "Put:EditMember")
 	beego.Router("/api/members/delete", &MembersAPIController{}, "Delete:DeleteMembers")
 	source, _ := c.GetInt64("source", 0)
 	tag, _ := c.GetInt64("tag", 0)
 	init, _ := c.GetInt64("init", 0)
-	fmt.Println("level",level,"source",source)
+	fmt.Println("level", level, "source", source)
 	if page <= 0 {
 		page = 1
 	}
 	return
 }
 
+func (c *MembersAPIController) GetAllMembers() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	members, err := member_service.GetAllMemberList(adminUserInfo.CurrentOrgId)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDataException, "获取列表失败")
+		return
+	}
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["members"] = members
+
+	c.ServeSuccessJSON(returnData)
+	return
+}
+
 func (c *MembersAPIController) CreateMember() {
 
 	adminUserInfo := c.GetAdminUserInfo()

service/member_service/member_service.go

 		Error
 	return customer, err
 }
+
+func GetAllMemberList(orgID int64) (members []*Members, err error) {
+	db := service.UserReadDB().Table("sgj_user_customer as c").Where("c.user_org_id=? and c.status=1", orgID)
+
+	err = db.Order("c.created_time desc").
+		Select("c.id, c.user_org_id, c.user_id, c.mobile, c.name, c.gender, c.province_id, c.city_id, c.address, c.birthday, c.treat_type, c.relationship, c.illness_id, c.wechat_openid, c.membership, c.sources, c.status, c.created_time, c.updated_time, c.avatar, c.wechat_unionid, c.remark, c.medical_diagnose, c.yz_uid, c.ill_date, c.district_id").Find(&members).Error
+	if err != nil {
+		return
+	}
+	if len(members) > 0 {
+		for _, member := range members {
+			member.Avatar = strings.Replace(member.Avatar, "http://7xkofe.com1.z0.glb.clouddn.com", "https://images.shengws.com", 1)
+		}
+	}
+	return
+}

service/tencentim_service/user_service.go

+package tencentim_service
+
+import (
+	"SCRM/service"
+)
+
+type InfoMap struct {
+	Cname      string
+	Name       string
+	Image      string
+	Uid        int64
+	Identifier string
+}
+
+func GetImUserMap(accountKey []string, userOrgID int64) (infoMap []InfoMap) {
+	service.UserReadDB().Table("sgj_user_user_im AS ui").
+		Joins("JOIN sgj_user_user AS u ON u.id = ui.user_id").
+		Joins("LEFT JOIN sgj_user_customer AS c ON c.user_id = ui.user_id AND c.user_org_id=? and c.status=1 and c.user_id>0 ", userOrgID).
+		Where("ui.identifier IN (?)", accountKey).
+		Select("ui.identifier, u.username as name, u.avatar as image, c.name as cname, u.id as uid").
+		Scan(&infoMap)
+
+	return
+
+}