commit

rpc/userlib/test/userLib_test.go

@@ -19,7 +19,7 @@ func Test_UserDocCollect(t *testing.T) {
 	})
 	userLib := userlibclient.NewUserLib(client)
 	resp, err := userLib.DocCollect(context.Background(), &userlibclient.UserCollectRequest{
-		DocId:        "1",
+		DocId:        "2",
 		UserId:       "1",
 		Cost: 0,
 	})

services/userlib/userDocService.go

@@ -22,21 +22,21 @@ func UserDocCollect(userDoc *model.UserDoc, cost int) bool {
 	err := orm.Transaction(func(tx *gorm.DB) error {
 		err0 := orm.Select("id,userId,docId,docCategory,isDelete").
 			Where("userId = ? AND docId = ? AND (isDelete = 0 OR isDelete = 1)",userDoc.UserId,userDoc.DocId).
-			Find(&docData)
-		if err0.Error != nil {
+			Find(&docData).Error
+		if err0 != nil {
 			log.Println("查询已存在收藏记录失败")
-			return nil
+			return err0
 		}
 		//已下载数据处理
 		if docData.DocCategory == 1 {
 			log.Println("该文档已下载，无法收藏")
-			return  nil
+			return  err0
 		}
 
 		//已收藏数据处理
 		if docData.IsDelete == 0 && docData.UserId != "" {
 			log.Println("此文档，该用户已收藏,不可重复收藏")
-			return nil
+			return err0
 		}
 		//已取消收藏，再次进行收藏
 		if docData.IsDelete == 1 && docData.UserId != "" {
@@ -44,7 +44,7 @@ func UserDocCollect(userDoc *model.UserDoc, cost int) bool {
 			if err != nil {
 				log.Println("文档再次收藏失败")
 				tx.Rollback()
-				return nil
+				return err
 			}
 			//无收藏记录，新增收藏
 		}else{
@@ -56,15 +56,16 @@ func UserDocCollect(userDoc *model.UserDoc, cost int) bool {
 			//查询文档基础信息
 			doc := model.Doc{}
 			err0 := orm.Where("id = ?",userDoc.DocId).
-				Find(&doc)
-			if err0.Error != nil {
+				Find(&doc).Error
+			if err0 != nil {
 				log.Println("文档不存在",err0)
-				return nil
+				return err0
 			}
 			userDoc.DocSourceUserId = doc.UserId
-			userDoc.DocCategory = doc.DocFileType
+			userDoc.DocCategory = 2
 			userDoc.IsDelete = int(userlib.UserDocStatus_Normal)
 			userDoc.DocName = doc.DocName
+			userDoc.DocFileType = doc.DocFileType
 			userDoc.DocFileSuffix = doc.DocFileSuffix
 			userDoc.DocFileSize = doc.DocFileSize
 			userDoc.DocPageSize = doc.DocPageSize
@@ -73,7 +74,7 @@ func UserDocCollect(userDoc *model.UserDoc, cost int) bool {
 			if err != nil {
 				log.Println("userDocCollect error:", err)
 				tx.Rollback()
-				return nil
+				return err
 			}
 		}
 		//用户收藏、转存记录表添加记录
@@ -81,9 +82,9 @@ func UserDocCollect(userDoc *model.UserDoc, cost int) bool {
 		if err != nil {
 			log.Println("userDocCollect record insert error:", err)
 			tx.Rollback()
-			return nil
+			return err
 		}
-		return nil
+		return err
 	})
 	if err != nil {
 		return false
@@ -187,6 +188,7 @@ func UserDocDownload(userDoc *model.UserDoc, cost int,hosts []string,key string)
 			userDoc.DocCategory = doc.DocFileType
 			userDoc.IsDelete = int(userlib.UserDocStatus_Normal)
 			userDoc.DocName = doc.DocName
+			userDoc.DocFileType = doc.DocFileType
 			userDoc.DocFileSuffix = doc.DocFileSuffix
 			userDoc.DocFileSize = doc.DocFileSize
 			userDoc.DocPageSize = doc.DocPageSize