Merge remote-tracking branch 'origin/feature/v1.0.1' into feature/v1.0.1_fu

# Conflicts:
#	rpc/partnerlib/partner.exe

rpc/partnerlib/etc/crontab.yaml

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

rpc/partnerlib/service/docDownload.go

@@ -37,32 +37,34 @@ func DocDownload(in *partnerlib.UserDownloadRequest) (res *partnerlib.UDRes, err
 		} else {
 			//获取文件信息
 			docInfo := partner.DocsFindOne(in.DocId)
-			//查看oss服务器是否已存在此文档
-			if res.OssDocId = docInfo.OssDocId; res.OssDocId == "" {
-				//获取附件后上传oss
-				if uploadRes := FileUpload(&filesystem.SaveFileReq{
-					Domain: IC.C.OssInfo.BucketName,
-					FileId: fmt.Sprintf("%s.%s", util.GetHashKey(b), docInfo.DocFileSuffix),
-					Meta: map[string]string{
-						"docName":   docInfo.DocName,
-						"docSuffix": docInfo.DocFileSuffix,
-						"docSize":   fmt.Sprintf("%d", docInfo.DocFileSize),
-					},
-					RawFileContent: b,
-				}); uploadRes.OssDocId != "" {
-					//更新doc
-					if err := partner.DocsUpdate(model.Doc{OssDocId: res.OssDocId}); err != nil {
-						warn.SendMsgByWXURL(fmt.Sprintf("文档id：%s,文档名称：%s 上传tidb doc 异常：%s", docInfo.Id, docInfo.DocName, err.Error()))
+			if docInfo.DocName != "" {
+				//查看oss服务器是否已存在此文档
+				if res.OssDocId = docInfo.OssDocId; res.OssDocId == "" {
+					//获取附件后上传oss
+					if res.OssDocId = FileUpload(&filesystem.SaveFileReq{
+						Domain: IC.C.OssInfo.BucketName,
+						FileId: fmt.Sprintf("%s.%s", util.GetHashKey(b), docInfo.DocFileSuffix),
+						Meta: map[string]string{
+							"docName":   docInfo.DocName,
+							"docSuffix": docInfo.DocFileSuffix,
+							"docSize":   fmt.Sprintf("%d", docInfo.DocFileSize),
+						},
+						RawFileContent: b,
+					}).OssDocId; res.OssDocId != "" {
+						//更新doc
+						if errUpdate := partner.DocsUpdate(model.Doc{OssDocId: res.OssDocId}); errUpdate != nil {
+							warn.SendMsgByWXURL(fmt.Sprintf("文档id：%s,文档名称：%s 上传tidb doc 异常：%s", docInfo.Id, docInfo.DocName, err.Error()))
+						}
+						return
+					} else {
+						err = fmt.Errorf("文档上传失败")
+						warn.SendMsgByWXURL(fmt.Sprintf("文档id：%s,文档名称：%s，上传到oss异常：%s", docInfo.Id, docInfo.DocName, res.Msg))
 					}
-				} else {
-					warn.SendMsgByWXURL(fmt.Sprintf("文档id：%s,文档名称：%s，上传到oss异常：%s", docInfo.Id, docInfo.DocName, res.Msg))
 				}
-
 			}
 		}
-	} else {
-		res.Msg = err.Error()
-		res.Code = -1
 	}
+	res.Msg = err.Error()
+	res.Code = -1
 	return
 }

rpc/partnerlib/service/userBuy.go

@@ -26,7 +26,7 @@ func UBHandle(in *partnerlib.UserBuyVipRequest) (res *partnerlib.UBVRes, err err
 		docInfo = partner.DocsFindOne(in.DocId)
 	)
 	if docInfo.Id != "" {
-		orderCode := util.GetOrderCode(entity.PartnerName)
+		orderCode := util.GetOrderCode()
 		h := NewHH(IC.I.Docin.Name, IC.I.Docin.Host, IC.I.Docin.BuyRecord.Name, IC.I.Docin.BuyRecord.Pathname, IC.I.Docin.BuyRecord.Method, map[string]interface{}{
 			"orderNo":   orderCode,
 			"productId": in.DocId,
@@ -64,6 +64,8 @@ func UBHandle(in *partnerlib.UserBuyVipRequest) (res *partnerlib.UBVRes, err err
 				return
 			}
 		}
+	} else {
+		err = fmt.Errorf("未查到对应文档信息")
 	}
 	res.Msg = err.Error()
 	res.Code = -1

rpc/partnerlib/util/util.go

@@ -18,6 +18,6 @@ func GetHashKey(bs []byte) string {
 }
 
 // 创建订单号
-func GetOrderCode(name string) string {
-	return fmt.Sprintf("%s-%s", name, <-jy.VarOrderCode.Pool)
+func GetOrderCode() string {
+	return <-jy.VarOrderCode.Pool
 }

services/partner/docsFind.go

@@ -10,8 +10,8 @@ import (
 
 func DocsFindOne(docId string) (doc *model.Docin) {
 	doc = &model.Docin{}
-	err := jyDocRpcUtil.GetJyDocsDB().Table(entity.DocTable).Where("id = ?", docId).Find(doc)
-	if err != nil {
+	err := jyDocRpcUtil.GetJyDocsDB().Table(entity.DocTable).Where("id = ?", docId).Find(doc).Error
+	if err != nil || doc.DocName == "" {
 		log.Println(fmt.Sprintf("获取 doc 文档 - %s 异常:%s", docId, err.Error))
 	}
 	return