Merge branch 'v1.0.1_ws' of moapp/jy_docs into feature/v1.0.1

rpc/partnerlib/crontab/service/docinUpdate.go

@@ -15,24 +15,28 @@ func UpdateDocinInfos(b []byte) (err error, lastId int64, expectTotal, actualTot
 	var docinInfos model.DocinInfoRes
 	err = json.Unmarshal(b, &docinInfos)
 	if err == nil {
-		if expectTotal = len(docinInfos.Data); expectTotal > 0 {
-			//更新doc
-			for _, v := range docinInfos.Data {
-				var (
-					id  = fmt.Sprintf("%s-%d", entity.PartnerName, v.ProductId)
-					doc = sm.Doc{}
-				)
-				lastId = v.ProductId
-				doc.Id = id
-				doc.UpdateDate, _ = time.ParseInLocation(date.Date_Full_Layout, v.ModifyDate, time.Local)
-				doc.Price = int(v.Price * entity.Multiple)
-				doc.PriceVip = v.PriceVip
-				doc.ProductType = int64(v.Ifcharge + entity.Charge)
-				doc.DownOrUp = v.State
-				if err := partner.DocsUpdate(doc); err == nil {
-					actualTotal++
+		if docinInfos.Code == 0 {
+			if expectTotal = len(docinInfos.Data); expectTotal > 0 {
+				//更新doc
+				for _, v := range docinInfos.Data {
+					var (
+						id  = fmt.Sprintf("%s-%d", entity.PartnerName, v.ProductId)
+						doc = sm.Doc{}
+					)
+					lastId = v.ProductId
+					doc.Id = id
+					doc.UpdateDate, _ = time.ParseInLocation(date.Date_Full_Layout, v.ModifyDate, time.Local)
+					doc.Price = int(v.Price * entity.Multiple)
+					doc.PriceVip = v.PriceVip
+					doc.ProductType = int64(v.Ifcharge + entity.Charge)
+					doc.DownOrUp = v.State
+					if err := partner.DocsUpdate(doc); err == nil {
+						actualTotal++
+					}
 				}
 			}
+		} else {
+			err = fmt.Errorf(docinInfos.Msg)
 		}
 	}
 	return

rpc/partnerlib/etc/crontab.yaml

@@ -1,7 +1,7 @@
-IsRun: false
+IsRun: true
 NewDocsList:
   Name: syncDocs
-  First: true
+  First: false
   Time: "0 0 0/4 * * ?"
   StartId: 0
   StartIdKey: docin_sync_start_id
@@ -9,12 +9,12 @@ NewDocsList:
   SleepTime: 10
 UpdateDocsList:
   Name: updateDocs
-  First: false
+  First: true
   Time: "0 0 2 ? * 7" # 豆丁文档更新量比较少，每周六早上两点开始
   StartId: 0 # 首次任务执行：0；以后配置成1
   StartIdKey: docin_update_start_id
   Count: 50
-  StartDate: "20230411" # 首次任务执行：20240411
+  StartDate: "20240411" # 首次任务执行：20240411
   StartDateKey: docin_update_start_date
   EndDate: "" # 默认空
   SleepTime: 10

services/partner/docsUpdate.go

@@ -23,7 +23,7 @@ func DocsUpdate(doc model.Doc) (err error) {
 		updateMap["ossDocId"] = doc.OssDocId
 	}
 	err = docRpcUtil.GetJyDocsDB().Table(entity.DocTable).Where("id=?", doc.Id).Updates(updateMap).Error
-	if err.Error != nil {
+	if err != nil {
 		log.Println("error:", err.Error)
 		return
 	}