wip:提交

jydocs-back/config/config.go

@@ -34,9 +34,9 @@ type appConfig struct {
 		Base int64 `json:"base"` // 价格基数
 	} `json:"price"`
 	DocMember struct {
-		Times        int   `json:"times"`        // 会员免费下载次数
+		Times        int64 `json:"times"`        // 会员免费下载次数
 		Discount     int64 `json:"discount"`     // 会员折扣
-		FreeDocLimit int   `json:"freeDocLimit"` // 豆丁会员免费下载限制
+		FreeDocLimit int64 `json:"freeDocLimit"` // 豆丁会员免费下载限制
 	} `json:"docMember"`
 }
 

jydocs-back/go.mod

@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	app.yhyue.com/moapp/jyPoints v1.1.2-0.20231020023521-1a4b1bbf9736
-	app.yhyue.com/moapp/jy_docs v1.1.9
+	app.yhyue.com/moapp/jy_docs v1.1.10
 	app.yhyue.com/moapp/jybase v0.0.0-20240523083821-42a82b37ae20
 	app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4
 	app.yhyue.com/moapp/jypkg v1.21.5

jydocs-back/go.sum

@@ -6,8 +6,8 @@ app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547/go.mod h1:J
 app.yhyue.com/moapp/jyPoints v1.1.2-0.20231020023521-1a4b1bbf9736 h1:7Vl3qq1nJZyRQNyMDoCTC14ScKABZqbUmJP0WpOLnIQ=
 app.yhyue.com/moapp/jyPoints v1.1.2-0.20231020023521-1a4b1bbf9736/go.mod h1:NEkVbas7w0Lg4/BPoN4rkl808q4OKv7Bk5lwTXvOThU=
 app.yhyue.com/moapp/jy_docs v1.1.1/go.mod h1:54sK98Z5tpMFd2aPLN1IRfEyV3zpFRyFxKj6oi2C5/Q=
-app.yhyue.com/moapp/jy_docs v1.1.9 h1:S7fTrwc/Q//hv//gIuVFbiY36NxeUNa5ReqMtXyqjVc=
-app.yhyue.com/moapp/jy_docs v1.1.9/go.mod h1:lFwlF0Lrh0VuYejyfXqlxyaVR4xU1zdHGDCKYbc5MH4=
+app.yhyue.com/moapp/jy_docs v1.1.10 h1:+DrKP22V0jDNFVZ16g0cpmGSz6nVqQMSisjT+s5iSDc=
+app.yhyue.com/moapp/jy_docs v1.1.10/go.mod h1:KJqoPg6h/Zl0N9PAMNEisoRXjFabtMtUK6tL4zAj39o=
 app.yhyue.com/moapp/jybase v0.0.0-20210322021809-141cc2c37946/go.mod h1:29ShuI8y7qEyg2KviHSx1iamiCioBKdTMm2ndVzWAhk=
 app.yhyue.com/moapp/jybase v0.0.0-20220415064050-37ce64b3e2d4/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20220418104200-46c3fff161c7/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=

jydocs-back/rpc/userDocRpc.go

@@ -141,7 +141,7 @@ func PayDoc(userId, docId string) error {
 	}
 	return nil
 }
-func TodayCount(userId string) (int64, error) {
+func TodayCount(userId string) (int64, int64, error) {
 	resp, err := jyUserDocLib.UserTodayCount(context.Background(), &userlib.UserTodayCountReq{
 		AppId:       config.JyDocsAppConfig.AppId,
 		UserId:      userId,
@@ -149,11 +149,11 @@ func TodayCount(userId string) (int64, error) {
 	})
 	if err != nil {
 		log.Printf("%s UserTodayCount call error %v\n", userId, err)
-		return 0, err
+		return 0, 0, err
 	}
 	if resp.Code != 1 {
 		log.Printf("%s UserTodayCount fail Message %v\n", userId, resp.Message)
-		return 0, fmt.Errorf("获取用户下载次数失败")
+		return 0, 0, fmt.Errorf("获取用户下载次数失败")
 	}
-	return resp.Count, nil
+	return resp.Count, resp.TotalCount, nil
 }

jydocs-back/servers/stdDoc.go

@@ -116,7 +116,7 @@ func (stdDoc *StdDoc) Detail() {
 			if mData != nil && mData.Data != nil {
 				if mData.Data.Docs.Status <= 0 {
 					// 免费用户 判断豆丁免费文档下载次数
-					count, err2 := rpc.TodayCount(userId)
+					count, _, err2 := rpc.TodayCount(userId)
 					if err2 != nil {
 						return nil, err2
 					}

jydocs-back/servers/userDoc.go

@@ -124,12 +124,13 @@ func (userDoc *UserDoc) DocBuy() {
 		}
 		docMemberStatus := mData.Data.Docs.Status > 0
 		freeDownload := mData.Data.Docs.FreeDownload
-		surplus, use := 0, 0 // 今日下载剩余次数,今日消耗次数
+		surplus, douding, use := int64(0), int64(0), int64(0) // 今日下载剩余次数,,今日豆丁消耗次数,今日消耗次数
+		var err2 error
 		payWay := "剑鱼币"
 		if docInfo.ProductType == public.ProductTypeMemberFree {
 			// 如果是会员免费 判断是否超出进入下载次数
 			// 获取今日下载次数
-			count, err2 := rpc.TodayCount(userId)
+			douding, use, err2 = rpc.TodayCount(userId)
 			if err2 != nil {
 				return nil, err2
 			}
@@ -137,7 +138,6 @@ func (userDoc *UserDoc) DocBuy() {
 			if docMemberStatus {
 				totalLimit = config.JyDocsAppConfig.DocMember.Times
 			}
-			use = int(count)
 			surplus = totalLimit - use
 			if surplus <= 0 {
 				surplus = 0
@@ -212,7 +212,7 @@ func (userDoc *UserDoc) DocBuy() {
 		// 没有ossdocId 说明是还没有下过的 需要先获得地址
 		if docInfo.OssDocId == "" && docInfo.Source == public.SourceDd {
 			// 如果是精品文档 或者 是免费文档剑鱼文库会员超过10篇   则需要先调购买接口
-			if docInfo.ProductType == int64(public.ProductTypePremium) || use >= config.JyDocsAppConfig.DocMember.FreeDocLimit {
+			if docInfo.ProductType == int64(public.ProductTypePremium) || douding >= config.JyDocsAppConfig.DocMember.FreeDocLimit {
 				buyType := common.If(docMemberStatus, public.DdUserBuyType0, public.DdUserBuyType1).(int)
 				_, err2 := rpc.PartUserBuy(docId, userInfo.MgoUserId, userInfo.Phone, userInfo.PositionId, int64(buyType))
 				if err2 != nil {

jydocs-back/test/p525.http

@@ -44,9 +44,9 @@ docId=docin-3176669581
 ###
 POST https://jybx3-webtest.jydev.jianyu360.com/jydocs/user/buy
 Content-Type: application/x-www-form-urlencoded
-Cookie: SESSIONID=751b0b54bed58be980d081413c75088de0b1b6cb;
+Cookie: SESSIONID=d6d16e5272466216cb3fb63c80f82cb2938a4e6c;
 
-docId=26aa403e-899e-11eb-8b3b-0050568f51e7
+docId=e718b220-8d2b-11eb-93d6-0050568f1307
 
 ###
 POST https://jybx3-webtest.jydev.jianyu360.com/jydocs/user/collect/add