Merge branch 'dev/v1.2.6_dx' of SocialPlatform/messageCenter into feature/v1.2.6

rpc/messagecenter/internal/logic/oneuserconversationlogic.go

@@ -29,7 +29,7 @@ func (l *OneUserConversationLogic) OneUserConversation(in *messagecenter.OneUser
 	// todo: add your logic here and delete this line
 	errorMsg := service.OneCreatingSession(in)
 	if errorMsg != "" {
-		return &messagecenter.CurrencyResp{ErrorCode: 1001, ErrorMsg: errorMsg}, nil
+		return &messagecenter.CurrencyResp{ErrorCode: -1, ErrorMsg: errorMsg}, nil
 	}
 	return &messagecenter.CurrencyResp{}, nil
 }

rpc/messagecenter/internal/logic/userlistlogic.go

@@ -39,7 +39,12 @@ func (l *UserListLogic) UserList(in *messagecenter.UserReq) (*messagecenter.User
 	var result = []*messagecenter.UserEntity{}
 	if data != nil && len(*data) > 0 {
 		for _, v := range *data {
-			tim, _ := time.ParseInLocation(util.Date_Full_Layout, quitl.InterfaceToStr(v["create_time"]), time.Local)
+			var tim time.Time
+			if quitl.InterfaceToStr(v["create_time"]) != "" {
+				tim, _ = time.ParseInLocation(util.Date_Full_Layout, quitl.InterfaceToStr(v["create_time"]), time.Local)
+			} else {
+				tim, _ = time.ParseInLocation(util.Date_Full_Layout, quitl.InterfaceToStr(v["timestamp"]), time.Local)
+			}
 			groupMember, _ := v["groupMember"].([]string)
 			userResp := messagecenter.UserEntity{
 				Name:        quitl.ObjToString(v["name"]),

service/message_mail_box.go

@@ -1260,12 +1260,11 @@ func OneCreatingSession(in *messagecenter.OneUserConversationReq) string {
 	if IC.BaseMysql.Count(util.SOCIALIZE_SUMMARY, map[string]interface{}{"my_position_id": in.MyPositionId, "your_position_id": in.YouPositionId}) > 0 {
 		return ""
 	}
-
 	if IC.BaseMysql.Insert(util.SOCIALIZE_SUMMARY, map[string]interface{}{
 		"my_position_id":          in.MyPositionId,
 		"your_position_id":        in.YouPositionId,
-		"message_id":              "",
-		"timestamp":               time.Now(),
+		"message_id":              0,
+		"timestamp":               time.Now().Format(date.Date_Full_Layout),
 		"unread":                  0,
 		"customer_service_access": 0,
 	}) > 0 {