Browse Source

feat:p525 jydocs-back 兑换接口调整

fuwencai 1 năm trước cách đây
mục cha
commit
7271d575cb
2 tập tin đã thay đổi với 13 bổ sung3 xóa
  1. 1 1
      jydocs-back/rpc/userDocRpc.go
  2. 12 2
      jydocs-back/servers/userDoc.go

+ 1 - 1
jydocs-back/rpc/userDocRpc.go

@@ -150,7 +150,7 @@ func TodayCount(userId string) (int64, error) {
 	}
 	if resp.Code != 1 {
 		log.Printf("%s UserTodayCount fail Message %v\n", userId, resp.Message)
-		return 0, fmt.Errorf("获取用户")
+		return 0, fmt.Errorf("获取用户下载次数失败")
 	}
 	return resp.Count, nil
 }

+ 12 - 2
jydocs-back/servers/userDoc.go

@@ -121,6 +121,7 @@ func (userDoc *UserDoc) DocBuy() {
 		}
 		docMemberStatus := docMember["docMemberStatus"].(bool)
 		freeDownload := docMember["free_download"].(int)
+		surplus, use := 0, 0 // 今日下载剩余次数,今日消耗次数
 		if docMemberStatus {
 			// 会员
 			switch payType {
@@ -129,12 +130,18 @@ func (userDoc *UserDoc) DocBuy() {
 					// 如果是会员免费 判断是否超出进入下载次数
 					// 获取今日下载次数
 					count, err2 := rpc.TodayCount(userId)
+
 					if err2 != nil {
 						return nil, err2
 					}
-					if int(count) >= config.JyDocsAppConfig.DocMember.Times {
+					use = int(count)
+					surplus = config.JyDocsAppConfig.DocMember.Times - use
+					if surplus <= 0 {
+						surplus = 0
 						return map[string]interface{}{
-							"status": public.StatusMemberFreeExhaust,
+							"status":  public.StatusMemberFreeExhaust,
+							"surplus": surplus,
+							"use":     use,
 						}, nil
 					}
 					//  没有超过下载次数  下一步应该到转存 不用扣剑鱼币
@@ -229,6 +236,9 @@ func (userDoc *UserDoc) DocBuy() {
 			rpc.DocStatistics(userId, docId, rpc.Down)
 		}()
 		return map[string]interface{}{
+			"status":  0,
+			"surplus": surplus,
+			"use":     use,
 			"code":    serialNumber,
 			"balance": userPoint - docPoint,
 			"payTime": time.Now().Unix(),