Merge remote-tracking branch 'origin/master'

api/grpc/base.go

@@ -184,6 +184,15 @@ func (a Api) EqSimpleQuery(ctx context.Context, r *pb.StandardRequest) (*pb.Stan
 	return rst, nil
 }
 
+// ManageableSimpleQuery 商家管理员简单查询-通过商家自己ID查询
+func (a Api) ManageableSimpleQuery(ctx context.Context, r *pb.ManageableSimpleQueryRequest) (*pb.ManageableSimpleQueryReply, error) {
+	token := a.getToken(ctx)
+
+	rs := service.Shop{}.ManageableSimpleQuery(token, r.GetShopId())
+
+	return rs, nil
+}
+
 // ----------------------- 商家信息管理 ---------------------------------------------
 
 func (a Api) ManageableShopList(ctx context.Context, r *pb.ShopListRequest) (*pb.ShopListReply, error) {

api/grpc/base/base_grpc.pb.go

@@ -29,7 +29,7 @@ type ApiClient interface {
 	VipUserSimpleQuery(ctx context.Context, in *StandardRequest, opts ...grpc.CallOption) (*StandardReply, error)
 	TempVipUserSimpleQuery(ctx context.Context, in *StandardRequest, opts ...grpc.CallOption) (*StandardReply, error)
 	ShopSimpleQuery(ctx context.Context, in *StandardRequest, opts ...grpc.CallOption) (*StandardReply, error)
-	ManageableSimpleQuery(ctx context.Context, in *StandardRequest, opts ...grpc.CallOption) (*StandardReply, error)
+	ManageableSimpleQuery(ctx context.Context, in *ManageableSimpleQueryRequest, opts ...grpc.CallOption) (*ManageableSimpleQueryReply, error)
 	ClassSimpleQuery(ctx context.Context, in *StandardRequest, opts ...grpc.CallOption) (*StandardReply, error)
 	ScreenSimpleQuery(ctx context.Context, in *StandardRequest, opts ...grpc.CallOption) (*StandardReply, error)
 	GroupSimpleQueryByShopID(ctx context.Context, in *StandardRequest, opts ...grpc.CallOption) (*StandardReply, error)
@@ -244,8 +244,8 @@ func (c *apiClient) ShopSimpleQuery(ctx context.Context, in *StandardRequest, op
 	return out, nil
 }
 
-func (c *apiClient) ManageableSimpleQuery(ctx context.Context, in *StandardRequest, opts ...grpc.CallOption) (*StandardReply, error) {
-	out := new(StandardReply)
+func (c *apiClient) ManageableSimpleQuery(ctx context.Context, in *ManageableSimpleQueryRequest, opts ...grpc.CallOption) (*ManageableSimpleQueryReply, error) {
+	out := new(ManageableSimpleQueryReply)
 	err := c.cc.Invoke(ctx, "/base.Api/ManageableSimpleQuery", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1303,7 +1303,7 @@ type ApiServer interface {
 	VipUserSimpleQuery(context.Context, *StandardRequest) (*StandardReply, error)
 	TempVipUserSimpleQuery(context.Context, *StandardRequest) (*StandardReply, error)
 	ShopSimpleQuery(context.Context, *StandardRequest) (*StandardReply, error)
-	ManageableSimpleQuery(context.Context, *StandardRequest) (*StandardReply, error)
+	ManageableSimpleQuery(context.Context, *ManageableSimpleQueryRequest) (*ManageableSimpleQueryReply, error)
 	ClassSimpleQuery(context.Context, *StandardRequest) (*StandardReply, error)
 	ScreenSimpleQuery(context.Context, *StandardRequest) (*StandardReply, error)
 	GroupSimpleQueryByShopID(context.Context, *StandardRequest) (*StandardReply, error)
@@ -1461,7 +1461,7 @@ func (UnimplementedApiServer) TempVipUserSimpleQuery(context.Context, *StandardR
 func (UnimplementedApiServer) ShopSimpleQuery(context.Context, *StandardRequest) (*StandardReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ShopSimpleQuery not implemented")
 }
-func (UnimplementedApiServer) ManageableSimpleQuery(context.Context, *StandardRequest) (*StandardReply, error) {
+func (UnimplementedApiServer) ManageableSimpleQuery(context.Context, *ManageableSimpleQueryRequest) (*ManageableSimpleQueryReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ManageableSimpleQuery not implemented")
 }
 func (UnimplementedApiServer) ClassSimpleQuery(context.Context, *StandardRequest) (*StandardReply, error) {
@@ -1985,7 +1985,7 @@ func _Api_ShopSimpleQuery_Handler(srv interface{}, ctx context.Context, dec func
 }
 
 func _Api_ManageableSimpleQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(StandardRequest)
+	in := new(ManageableSimpleQueryRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1997,7 +1997,7 @@ func _Api_ManageableSimpleQuery_Handler(srv interface{}, ctx context.Context, de
 		FullMethod: "/base.Api/ManageableSimpleQuery",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ApiServer).ManageableSimpleQuery(ctx, req.(*StandardRequest))
+		return srv.(ApiServer).ManageableSimpleQuery(ctx, req.(*ManageableSimpleQueryRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }

assembly/base/service/shop.go

@@ -13,6 +13,7 @@ import (
 	"sportfitness/base/assembly/base/repository/postgre"
 	"sportfitness/base/errors"
 	"sportfitness/base/repository/grpc/bsw/im"
+	im2 "sportfitness/base/repository/grpc/bsw/im/im"
 	"strconv"
 )
 
@@ -58,6 +59,53 @@ func (s Shop) ManageableShopList(token string, r *pb.ShopListRequest) *pb.ShopLi
 	return &pb.ShopListReply{List: info}
 }
 
+type ManageableSimpleList struct {
+	Id       int64
+	UserCode string
+	Name     string
+	Email    string
+	Phone    string
+	Qq       string
+	Memo     string
+	Status   pb.WebStatus
+	//RoleId   int64  // 考虑要带出来用户权限，后废弃，不需要传出权限
+	//RoleName string
+}
+
+func (s Shop) ManageableSimpleQuery(token string, shopId int64) *pb.ManageableSimpleQueryReply {
+	// 获取商家可用商家列表shopId传入0，因为是通用接口
+	_ = s.checkPermission(token, 0)
+	rst := im.ManageableSimpleQuery(shopId, im2.Status_On)
+	//println(rst)
+	var info []*ManageableSimpleList
+	if len(rst.List) > 0 {
+		for _, v := range rst.List {
+			l := &ManageableSimpleList{}
+			l.Id = v.Id
+			l.UserCode = v.UserCode
+			l.Name = v.Name
+			l.Email = v.Email
+			l.Qq = v.Qq
+			l.Phone = v.Phone
+			l.Memo = v.Memo
+			l.Status = s.ManageStatusToWebStatus(v.Status)
+			// 考虑要带出来用户权限，后废弃，不需要传出权限
+			//roleRs := im.RoleList(l.Id, int64(global.SysID))
+			//for _, vr := range roleRs.List {
+			//	l.RoleId = vr.Id
+			//	l.RoleName = vr.Name
+			//}
+			info = append(info, l)
+		}
+	}
+	str, err := json.Marshal(info)
+	if err != nil {
+		println(err)
+	}
+	println(string(str))
+	return &pb.ManageableSimpleQueryReply{JsonList: string(str)}
+}
+
 func (s Shop) ManageableGetShopInfo(token string, r *pb.ShopDetailRequest) *pb.ShopInfo {
 
 	optId := s.checkPermission(token, r.GetShopId())

global/vars.go

@@ -5,4 +5,5 @@ var (
 	TokenExpireSec = int64(60 * 60 * 24 * 14)
 	TemplateCode   = "SMS_215480232"
 	SmsExpireNano  = 180000000000 // 3分钟
+	SysID          = 165495313363111936
 )

proto/server/base.proto

@@ -33,7 +33,7 @@ service Api {
   rpc VipUserSimpleQuery (StandardRequest) returns (StandardReply)  {}
   rpc TempVipUserSimpleQuery (StandardRequest) returns (StandardReply)  {}
   rpc ShopSimpleQuery (StandardRequest) returns (StandardReply)  {}
-  rpc ManageableSimpleQuery (StandardRequest) returns (StandardReply)  {}
+  rpc ManageableSimpleQuery (ManageableSimpleQueryRequest) returns (ManageableSimpleQueryReply)  {}
   rpc ClassSimpleQuery (StandardRequest) returns (StandardReply)  {}
   rpc ScreenSimpleQuery (StandardRequest) returns (StandardReply)  {}
   rpc GroupSimpleQueryByShopID (StandardRequest) returns (StandardReply)  {}
@@ -370,4 +370,16 @@ message WeiXinSignInRequest{
   string account = 2;
   //上级商家ID，必传，写入到微信代码中
   int64 sId = 3 ;
+}
+
+message ManageableSimpleQueryRequest{
+  // 0为全部
+  int64 roleId = 1;
+
+  // 0为全部
+  int64 shopId = 6;
+}
+
+message ManageableSimpleQueryReply{
+  string jsonList = 1;
 }

repository/grpc/bsw/im/api.go

@@ -160,3 +160,22 @@ func GetShopNavi(userId, shopId int64, parentId int64, status im.Status) *im.Use
 	handleErr(err)
 	return rs
 }
+
+func ManageableSimpleQuery(shopId int64, status im.Status) *im.UserListReply {
+
+	request := &im.UserListRequest{ShopId: shopId, Status: status}
+
+	rs, err := getClient().UserList(ctx(), request)
+	handleErr(err)
+	return rs
+}
+
+// RoleList 通过userId查询用户权限
+func RoleList(userId, sysId int64) *im.RoleListReply {
+
+	request := &im.RoleListRequest{UserId: userId, SysId: sysId}
+
+	rs, err := getClient().RoleList(ctx(), request)
+	handleErr(err)
+	return rs
+}