commit

rpc/userlib/internal/logic/doccancelcollectlogic.go

@@ -29,12 +29,12 @@ func (l *DocCancelCollectLogic) DocCancelCollect(in *userlib.UserDeleteRequest)
 	// todo: add your logic here and delete this line
 	result := &userlib.UserDeleteResponse{}
 	b := userLibService.UserDocCancelCollect(in.DocId)
+	result.Code = 400
+	result.Message = "取消收藏失败"
 	if b {
 		result.Code = 200
 		result.Message = "取消收藏成功"
 	}
-	result.Code = 400
-	result.Message = "取消收藏失败"
-	log.Printf("用户文档取消收藏,userId:[%s],docId:[%s] 是否成功:[%v]", in.DocId, b)
+	log.Printf("用户文档取消收藏,userId:[%s],docId:[%s] 是否成功:[%v]", in.DocId, b, result)
 	return result, nil
 }

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:        "2",
+		DocId:        "1",
 		UserId:       "1",
 		Cost: 0,
 	})
@@ -39,7 +39,7 @@ func Test_UserCancelDocCollect(t *testing.T) {
 	})
 	userLib := userlibclient.NewUserLib(client)
 	resp, err := userLib.DocCancelCollect(context.Background(), &userlibclient.UserDeleteRequest{
-		DocId:        "5",
+		DocId:        "7",
 	})
 	if err != nil {
 		log.Println("UserDoc Collect call error:", err)

services/userlib/userDocService.go

@@ -58,7 +58,7 @@ func UserDocCollect(userDoc *model.UserDoc, cost int) bool {
 			doc := model.Doc{}
 			err0 := orm.Where("id = ?",userDoc.DocId).
 				Find(&doc).Error
-			if err0 != nil {
+			if err0 != nil || doc.Id == "" {
 				log.Println("文档不存在",err0)
 				return err0
 			}
@@ -97,11 +97,11 @@ func UserDocCollect(userDoc *model.UserDoc, cost int) bool {
 func UserDocCancelCollect(userDocId string) bool {
 	orm := docRpcUtil.GetJyDocsDB()
 	err := orm.Transaction(func(tx *gorm.DB) error {
-		err := orm.Exec("UPDATE user_doc SET isDelete = 1 WHERE id = ?",userDocId).Error
+		err := orm.Exec("UPDATE user_doc SET isDelete = 1 WHERE id = ? AND docCategory = 2 AND isDelete = 0",userDocId).Error
 		if err != nil {
 			log.Println("文档取消收藏失败")
 			tx.Rollback()
-			return nil
+			return err
 		}
 		return nil
 	})