Merge remote-tracking branch 'origin/master' into master

internal/logic/add_mkt_logic.go

@@ -33,23 +33,23 @@ func (l *AddMktLogic) AddMkt(in *transform.MktReq) (*transform.MktRes, error) {
 	if err == sqlc.ErrNotFound {
 		mkt := model.MktResource{}
 		mkt.DelFlag = 0
-		mkt.CreateBy = sql.NullString{String: in.MkId}
-		mkt.CreateTime = sql.NullTime{Time: utils.ParseTime(in.CreateTime)}
-		mkt.LastUpdateTime = sql.NullTime{Time: utils.ParseTime(in.CreateTime)}
-		mkt.LastUpdateBy = sql.NullString{String: in.MkId}
-		mkt.StuName = sql.NullString{String: in.StuName}
-		mkt.StuLinkPerson = sql.NullString{String: in.StuLinkPerson}
-		mkt.StuPhone = sql.NullString{String: in.StuPhone}
-		mkt.SchId = sql.NullInt64{Int64: in.SchId}
-		mkt.StuAddress = sql.NullString{String: in.Address}
-		mkt.AgeGroup = sql.NullInt64{Int64: in.AgeGroup}
+		mkt.CreateBy = sql.NullString{String: in.MkId, Valid: true}
+		mkt.CreateTime = sql.NullTime{Time: utils.ParseTime(in.CreateTime), Valid: true}
+		mkt.LastUpdateTime = sql.NullTime{Time: utils.ParseTime(in.CreateTime), Valid: true}
+		mkt.LastUpdateBy = sql.NullString{String: in.MkId, Valid: true}
+		mkt.StuName = sql.NullString{String: in.StuName, Valid: true}
+		mkt.Relation1 = sql.NullInt64{Int64: in.StuLinkPerson, Valid: true}
+		mkt.StuPhone = sql.NullString{String: in.StuPhone, Valid: true}
+		mkt.SchId = sql.NullInt64{Int64: in.SchId, Valid: true}
+		mkt.StuAddress = sql.NullString{String: in.Address, Valid: true}
+		mkt.AgeGroup = sql.NullInt64{Int64: in.AgeGroup, Valid: true}
 		mkt.StuType = 8
-		mkt.NetworkDetail = sql.NullInt64{Int64: in.NetworkDetailId}
-		mkt.CallType = sql.NullInt64{Int64: in.CallType}
-		mkt.MaType = sql.NullInt64{Int64: in.MaType}
-		mkt.QuaoYji = sql.NullInt64{Int64: in.QuaoYji}
-		mkt.LoadUser = sql.NullString{String: in.MkId}
-		_, err = l.svcCtx.MktResourceModel.Insert(mkt)
+		mkt.NetworkDetail = sql.NullInt64{Int64: in.NetworkDetailId, Valid: true}
+		mkt.CallType = sql.NullInt64{Int64: in.CallType, Valid: true}
+		mkt.MaType = sql.NullInt64{Int64: in.MaType, Valid: true}
+		mkt.QuaoYji = sql.NullInt64{Int64: in.QuaoYji, Valid: true}
+		mkt.LoadUser = sql.NullString{String: in.MkId, Valid: true}
+		_, err := l.svcCtx.MktResourceModel.Insert(mkt)
 		if err != nil {
 			l.Logger.Error(err)
 			return &transform.MktRes{Status: 500}, nil

internal/logic/get_student_logic.go

@@ -26,10 +26,10 @@ func NewGetStudentLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetStu
 
 func (l *GetStudentLogic) GetStudent(in *transform.StudentReq) (*transform.StudentRes, error) {
 	mkt := model.MktResource{}
-	err := l.svcCtx.SqlConn.QueryRowPartial(&mkt, "select id, stu_phone from mkt_resource where id=?", in.Id)
+	err := l.svcCtx.SqlConn.QueryRowPartial(&mkt, "select id, stu_phone,create_by from mkt_resource where id=?", in.Id)
 	if err != nil {
 		logx.Error(err.Error())
 		return nil, err
 	}
-	return &transform.StudentRes{StuPhone: mkt.StuPhone.String}, nil
+	return &transform.StudentRes{Id: mkt.Id, StuPhone: mkt.StuPhone.String, CreateBy: mkt.CreateBy.String}, nil
 }

transform.proto

@@ -176,7 +176,7 @@ message MktReq {
 	int64 UserId = 4;
 	string StuName = 5;
 	int64 AgeGroup = 6;
-	string StuLinkPerson = 7;
+	int64 StuLinkPerson = 7;
 	string StuPhone = 8;
 	int64 SchId = 9;
 	string Address = 10;
@@ -206,6 +206,7 @@ message StudentReq {
 message StudentRes {
   int64 Id = 1;
 	string StuPhone = 2;
+  string CreateBy = 3;
 }
 
 service Transform {

transformclient/transform.go

@@ -14,43 +14,43 @@ import (
 )
 
 type (
-	GetErpSchoolRes              = transform.GetErpSchoolRes
-	DataPermissionReq            = transform.DataPermissionReq
-	OrganSchool                  = transform.OrganSchool
-	GetErpOrganSchPerByUserIdRes = transform.GetErpOrganSchPerByUserIdRes
-	Active                       = transform.Active
-	DataPermissionRes            = transform.DataPermissionRes
-	MktReq                       = transform.MktReq
-	ExcelLogReq                  = transform.ExcelLogReq
+	Options                      = transform.Options
+	GetErpActiveReq              = transform.GetErpActiveReq
+	TokenRequest                 = transform.TokenRequest
+	Empty                        = transform.Empty
+	OptionsetReq                 = transform.OptionsetReq
 	OptionsetRes                 = transform.OptionsetRes
-	ListOfInt                    = transform.ListOfInt
-	TokenResponse                = transform.TokenResponse
-	TreeNodes                    = transform.TreeNodes
-	ResponseByte                 = transform.ResponseByte
+	SchoolIdsRes                 = transform.SchoolIdsRes
 	CityIdsReq                   = transform.CityIdsReq
-	CityIdsRes                   = transform.CityIdsRes
-	BytesReq                     = transform.BytesReq
-	UserRequest                  = transform.UserRequest
-	ExcelLogRes                  = transform.ExcelLogRes
-	GetErpActiveReq              = transform.GetErpActiveReq
-	MktRes                       = transform.MktRes
-	UserResponse                 = transform.UserResponse
+	MktReq                       = transform.MktReq
 	SchoolIdsReq                 = transform.SchoolIdsReq
-	SchoolIdsRes                 = transform.SchoolIdsRes
-	BytesResp                    = transform.BytesResp
+	CityIdsRes                   = transform.CityIdsRes
 	GetErpRoleRes                = transform.GetErpRoleRes
-	GetErpRoleReq                = transform.GetErpRoleReq
+	GetErpOrganSchPerByUserIdReq = transform.GetErpOrganSchPerByUserIdReq
+	OrganSchool                  = transform.OrganSchool
+	Active                       = transform.Active
+	StudentReq                   = transform.StudentReq
 	StudentRes                   = transform.StudentRes
-	TokenRequest                 = transform.TokenRequest
+	GetErpSchoolRes              = transform.GetErpSchoolRes
+	GetErpActiveRes              = transform.GetErpActiveRes
+	DataPermissionReq            = transform.DataPermissionReq
+	DataPermissionRes            = transform.DataPermissionRes
+	TokenResponse                = transform.TokenResponse
+	TreeNode                     = transform.TreeNode
 	Tag                          = transform.Tag
-	OptionsetReq                 = transform.OptionsetReq
+	BytesResp                    = transform.BytesResp
+	MktRes                       = transform.MktRes
+	UserResponse                 = transform.UserResponse
 	OptionCode                   = transform.OptionCode
-	Options                      = transform.Options
-	TreeNode                     = transform.TreeNode
-	GetErpOrganSchPerByUserIdReq = transform.GetErpOrganSchPerByUserIdReq
-	GetErpActiveRes              = transform.GetErpActiveRes
-	StudentReq                   = transform.StudentReq
-	Empty                        = transform.Empty
+	ListOfInt                    = transform.ListOfInt
+	BytesReq                     = transform.BytesReq
+	GetErpRoleReq                = transform.GetErpRoleReq
+	GetErpOrganSchPerByUserIdRes = transform.GetErpOrganSchPerByUserIdRes
+	UserRequest                  = transform.UserRequest
+	ResponseByte                 = transform.ResponseByte
+	ExcelLogReq                  = transform.ExcelLogReq
+	ExcelLogRes                  = transform.ExcelLogRes
+	TreeNodes                    = transform.TreeNodes
 
 	Transform interface {
 		GetUser(ctx context.Context, in *UserRequest) (*UserResponse, error)