Merge branch 'master' of http://192.168.3.207:8080/ApplicationCenter/medicalField into master

api/medical/internal/logic/public/isclaimedlogic.go

@@ -40,6 +40,7 @@ func (l *IsClaimedLogic) IsClaimed(req *types.IsClaimedReq) (resp *types.CommonR
 		UserId: int64(req.UserId),
 		EntId:  entID,
 		Type:   int64(req.Type),
+		AppId:  req.AppId,
 	})
 	return &types.CommonRes{
 		Error_msg:  rs.ErrorMsg,

api/medical/internal/types/types.go

@@ -82,6 +82,7 @@ type IsClaimedReq struct {
 	UserId    int    `header:"newUserId"`      // 用户id
 	CompanyId string `json:"company_id"`       // 机构id
 	Type      int    `json:"type,options=1|2"` // 1 医疗机构 2 经销商
+	AppId     string `header:"appId"`          // appid
 }
 
 type GetNewMsgListReq struct {

api/medical/medical.api

@@ -84,6 +84,7 @@ type IsClaimedReq {
 	UserId    int    `header:"newUserId"`      // 用户id
 	CompanyId string `json:"company_id"`       // 机构id
 	Type      int    `json:"type,options=1|2"` // 1 医疗机构 2 经销商
+	AppId     string `header:"appId"`          // appid
 }
 
 // 获取机构信息请求

rpc/medical/init/init.go

@@ -24,6 +24,7 @@ var C config.Config
 
 func init() {
 	conf.MustLoad(*configF, &C)
+	log.Println(C)
 	//初始化mysql
 	mm := C.MysqlMain
 	if mm.Address != "" {

rpc/medical/internal/logic/userauthinfosavelogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/entity"
+	IC "bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/rpc/medical/init"
 	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/service"
 	"context"
 
@@ -30,6 +31,8 @@ func (l *UserAuthInfoSaveLogic) UserAuthInfoSave(in *medical.UserInfo) (*medical
 	// todo: add your logic here and delete this line
 	m := service.AuthService{
 		BasesqlConn: entity.BaseMysql,
+		GoodsSpecId: IC.C.GoodsSpecId,
+		GoodsCode:   IC.C.GoodsCode,
 	}
 	errcode, msg := m.UserAuthInfoSave(in)
 	result := &medical.CommonResp{}

service/InstitutionService_test.go

@@ -185,14 +185,11 @@ func TestInstitutionService_Distributor(t *testing.T) {
 			args: args{
 				&medical.SearchDistributorReq{
 					CompanyName: "公司",
-					AreaCode:    "{'河南':['郑州市','开封市'],'北京':[]}",
+					AreaCode:    "{'河南':['郑州市','开封市'],'宁夏':[]}",
 					BusinessScope: []*medical.Business_Scope{
 						{Key: []string{"定制式义齿"},
 							Appendkey: []string{},
 							Notkey:    []string{"1", "2"}},
-						{Key: []string{"细胞保存液"},
-							Appendkey: []string{"释放剂"},
-							Notkey:    []string{"1", "2"}},
 					},
 					Brand:            "",
 					ProductModel:     "",