wip:信息返回提示

rpc/partnerlib/crontab/service/docinInfo.go

@@ -17,8 +17,8 @@ import (
 
 func InsertDocinInfos(b []byte) (err error, lastId int64, expectTotal, actualTotal int) {
 	var docinInfos model.DocinInfoRes
-	str := string(b)
-	fmt.Println(str, "--------------")
+	//str := string(b)
+	//fmt.Println(str, "--------------")
 	err = json.Unmarshal(b, &docinInfos)
 	if err == nil {
 		if expectTotal = len(docinInfos.Data); expectTotal > 0 {
@@ -103,6 +103,12 @@ func InsertDocinInfos(b []byte) (err error, lastId int64, expectTotal, actualTot
 				//es sync data
 				partner.SyncDocsToES(docsES)
 			}
+		} else {
+			msg := entity.Res[docinInfos.Msg]
+			if msg == "" {
+				msg = "同步豆丁数据异常"
+			}
+			err = fmt.Errorf(msg)
 		}
 	}
 	return

rpc/partnerlib/crontab/service/docinUpdate.go

@@ -36,7 +36,7 @@ func UpdateDocinInfos(b []byte) (err error, lastId int64, expectTotal, actualTot
 				}
 			}
 		} else {
-			err = fmt.Errorf(docinInfos.Msg)
+			err = fmt.Errorf(entity.Res[docinInfos.Msg])
 		}
 	}
 	return

rpc/partnerlib/entity/entity.go

@@ -20,4 +20,13 @@ var (
 	SyncExpectTotal, SyncActualTotal, UpdateExpectTotal, UpdateActualTotal int //批次预计处理数据和实际处理数据
 	DocsLock                                                               = &sync.Mutex{}
 	Charge                                                                 = 1
+	Res                                                                    = map[string]string{
+		"SUCCESS":     "成功",
+		"NO AUTH":     "无权限",
+		"PARAM ERROR": "参数异常",
+		"NO RESULT":   "无结果",
+		"NO PRODUCT":  "无文档",
+		"NO FILE":     "无文件",
+		"FILE ERROR":  "文件异常",
+	}
 )

rpc/partnerlib/etc/crontab.yaml

@@ -1,4 +1,4 @@
-IsRun: true
+IsRun: false
 NewDocsList:
   Name: syncDocs
   First: false

rpc/partnerlib/service/docDownload.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"app.yhyue.com/moapp/jy_docs/rpc/partnerlib/entity"
 	IC "app.yhyue.com/moapp/jy_docs/rpc/partnerlib/init"
 	"app.yhyue.com/moapp/jy_docs/rpc/partnerlib/type/partnerlib"
 	"app.yhyue.com/moapp/jy_docs/rpc/partnerlib/util"
@@ -33,7 +34,11 @@ func DocDownload(in *partnerlib.UserDownloadRequest) (res *partnerlib.UDRes, err
 		//豆丁同步数据到mongo
 		go h.SaveDocinLogger(b, err, "res")
 		if isJson {
-			err = json.Unmarshal(b, &res)
+			if err = json.Unmarshal(b, &res); err == nil {
+				res.Msg = entity.Res[res.Msg]
+				return
+			}
+
 		} else {
 			//获取文件信息
 			docInfo := partner.DocsFindOne(in.DocId)

rpc/partnerlib/service/userBuy.go

@@ -43,29 +43,32 @@ func UBHandle(in *partnerlib.UserBuyVipRequest) (res *partnerlib.UBVRes, err err
 			go h.SaveDocinLogger(b, err, "res")
 			bRes := &BRes{}
 			if err = json.Unmarshal(b, &bRes); err == nil {
-				//更新文档购买记录
-				if err = partner.InsertBuyDocOrder(&model.DocinUserOrder{
-					PositionId:   in.PositionId,
-					MgoUserId:    in.MgoUserId,
-					Phone:        in.Phone,
-					DocId:        docInfo.Id,
-					OrderCode:    orderCode,
-					Price:        docInfo.Price,
-					PriceVip:     docInfo.PriceVip,
-					PurchaseType: int(in.Type), //购买类型：1 币买文档,2 券买文档,3 月大会员,4 季大会员,5 年大会员
-					State:        1,            //合作商：1：豆丁
-					CreateTime:   date.NowFormat(date.Date_Full_Layout),
-				}); err == nil {
-					warn.SendMsgByWXURL(fmt.Sprintf("%s文档名称： %s，文档id：%s,购买订单编号：%s,请求信息：%v", entity.PartnerName, docInfo.DocName, docInfo.Id, orderCode, in))
+				if bRes.Code == 0 {
+					//更新文档购买记录
+					if err = partner.InsertBuyDocOrder(&model.DocinUserOrder{
+						PositionId:   in.PositionId,
+						MgoUserId:    in.MgoUserId,
+						Phone:        in.Phone,
+						DocId:        docInfo.Id,
+						OrderCode:    orderCode,
+						Price:        docInfo.Price,
+						PriceVip:     docInfo.PriceVip,
+						PurchaseType: int(in.Type), //购买类型：1 币买文档,2 券买文档,3 月大会员,4 季大会员,5 年大会员
+						State:        1,            //合作商：1：豆丁
+						CreateTime:   date.NowFormat(date.Date_Full_Layout),
+					}); err == nil {
+						warn.SendMsgByWXURL(fmt.Sprintf("%s文档名称： %s，文档id：%s,购买订单编号：%s,请求信息：%v", entity.PartnerName, docInfo.DocName, docInfo.Id, orderCode, in))
+					}
+					res.OrderNo = bRes.OrderNo
+					res.Msg = bRes.Msg
+					res.Code = bRes.Code
+					return
 				}
-				res.OrderNo = bRes.OrderNo
-				res.Msg = bRes.Msg
-				res.Code = bRes.Code
-				return
+				err = fmt.Errorf(entity.Res[res.Msg])
 			}
 		}
 	} else {
-		err = fmt.Errorf("未查到对应文档信息")
+		err = fmt.Errorf("参数异常")
 	}
 	res.Msg = err.Error()
 	res.Code = -1