feat:提交

jydocs-back/servers/userDoc.go

@@ -22,7 +22,6 @@ type UserDoc struct {
 	collectAdd    xweb.Mapper `xweb:"/user/collect/add"`    //收藏文库
 	collectRemove xweb.Mapper `xweb:"/user/collect/remove"` //取消收藏
 	docBuy        xweb.Mapper `xweb:"/user/buy"`            //文库购买
-	info          xweb.Mapper `xweb:"/user/info"`           //文库会员信息
 }
 
 // 用户文库列表
@@ -116,7 +115,7 @@ func (userDoc *UserDoc) DocBuy() {
 			return nil, fmt.Errorf("已兑换,请勿重复操作")
 		}
 		// 获取用户身份
-		docMember, err := getDocMemberStatus(userId, userDoc.Session())
+		docMember, err := getDocMemberStatus(userDoc.Session())
 		if err != nil {
 			return nil, err
 		}
@@ -242,44 +241,15 @@ func (userDoc *UserDoc) DocBuy() {
 	userDoc.ServeJson(NewResult(rData, errMsg))
 }
 
-// Info 剑鱼文库会员信息
-func (userDoc *UserDoc) Info() {
-	userId := common.ObjToString(userDoc.GetSession("userId"))
-	rData, errMsg := func() (interface{}, error) {
-		if userId == "" {
-			return map[string]interface{}{
-				"docMemberStatus": false,
-				"startTime":       0,
-				"endTime":         0,
-				"free_download":   public.FreeDownloadNoSL,
-			}, nil
-		}
-		return getDocMemberStatus(userId, userDoc.Session())
-	}()
-	if errMsg != nil {
-		log.Printf("%s UserDoc Info err:%s\n", userId, errMsg.Error())
-	}
-	userDoc.ServeJson(NewResult(rData, errMsg))
-}
-func getDocMemberStatus(userId string, session *httpsession.Session) (map[string]interface{}, error) {
+func getDocMemberStatus(session *httpsession.Session) (map[string]interface{}, error) {
 	mData := jy.GetBigVipUserBaseMsg(session, *config.Middleground)
 	if mData != nil {
 		vipStatus := mData.Data.Docs.Status
-		free_download := mData.Data.Docs.FreeDownload
-		if free_download == 0 && vipStatus <= 0 { // 不是文库会员时再查 没有使用过一次免费下载机会
-			// 查留资
-			count := public.MQFW.Count("saleLeads", map[string]interface{}{"userid": userId, "source": map[string]interface{}{"$in": config.JyDocsAppConfig.DocMember.Source}})
-			if count > 0 {
-				free_download = public.FreeDownloadHasFreeTimes
-			} else {
-				free_download = public.FreeDownloadNoSL
-			}
-		}
 		return map[string]interface{}{
 			"docMemberStatus": vipStatus > 0,
 			"startTime":       mData.Data.Docs.StartDate,
 			"endTime":         mData.Data.Docs.EndDate,
-			"free_download":   free_download,
+			"free_download":   mData.Data.Docs.FreeDownload,
 		}, nil
 	}
 	return nil, errors.New("获取文库会员状态失败")