Merge branch 'master' into ETA_1.8.7

models/base_from_eia_steo.go

@@ -160,7 +160,8 @@ func HandleEiaSteoData(dataList map[string]interface{}, indexInfo *BaseFromEiaSt
 			//fmt.Println(date, "=========", nowVal.Equal(valDecimal))
 			if !nowVal.Equal(valDecimal) {
 				tmpBaseFromEiaSteoData.Value = val
-				_, err = to.Update(tmpBaseFromEiaSteoData, "Value")
+				tmpBaseFromEiaSteoData.ModifyTime = time.Now()
+				_, err = to.Update(tmpBaseFromEiaSteoData, "Value", "ModifyTime")
 				if err != nil {
 					return
 				}

services/commodity_trade_cffex.go

@@ -117,6 +117,7 @@ func SyncRankingFromCffex() {
 		for _, xmlItem := range xmlItems {
 			for _, i := range xmlItem.Data {
 				i.ShortName = strings.Replace(i.ShortName,"(经纪)","",-1)
+				i.ShortName = strings.Replace(i.ShortName,"(代客)","",-1)
 				var item = new(models.BaseFromTradeCffexIndex)
 				item.DealValue = -1
 				item.BuyValue = -1

services/commodity_trade_dalian.go

@@ -53,18 +53,18 @@ func SyncRankingFromDalianSearch(dayNum int) (err error) {
 	endDate := time.Now().AddDate(0, 0, -dayNum).Format(utils.FormatDateTime)
 	//endDate := time.Now().Format(utils.FormatDateTime)
 	timeDate := utils.StrTimeToTime(endDate)
-	currDate := timeDate.Format(utils.FormatDateUnSpace)
-	year := timeDate.Year()
-	month := timeDate.Format("01")
-	var dayStr string
-	day := timeDate.Day()
-	if day < 10 {
-		dayStr = "0" + strconv.Itoa(day)
-	} else {
-		dayStr = strconv.Itoa(day)
-	}
-	monthNum, _ := strconv.Atoi(month)
-	month = strconv.Itoa(monthNum - 1) //获取时月份需要减一
+	//currDate := timeDate.Format(utils.FormatDateUnSpace)
+	//year := timeDate.Year()
+	//month := timeDate.Format("01")
+	//var dayStr string
+	//day := timeDate.Day()
+	//if day < 10 {
+	//	dayStr = "0" + strconv.Itoa(day)
+	//} else {
+	//	dayStr = strconv.Itoa(day)
+	//}
+	//monthNum, _ := strconv.Atoi(month)
+	//month = strconv.Itoa(monthNum - 1) //获取时月份需要减一
 	list, err := models.GetBaseFromTradeDalianDataList(timeDate.Format(utils.FormatDate))
 	if err != nil {
 		fmt.Println(err)
@@ -76,24 +76,24 @@ func SyncRankingFromDalianSearch(dayNum int) (err error) {
 	}
 
 	var ContractId string
-	var CarietyCode string
+	//var CarietyCode string
 	var VarietyName string
 	//模拟form表单请求
 	url := "http://www.dce.com.cn/publicweb/quotesdata/memberDealPosiQuotes.html"
 	method := "POST"
 	payload := &bytes.Buffer{}
 	writer := multipart.NewWriter(payload)
-	_ = writer.WriteField("memberDealPosiQuotes.variety", CarietyCode)
+	_ = writer.WriteField("memberDealPosiQuotes.variety", "c")
 	_ = writer.WriteField("memberDealPosiQuotes.trade_type", "0")
-	_ = writer.WriteField("year", strconv.Itoa(year))
-	_ = writer.WriteField("month", month)
-	_ = writer.WriteField("day", dayStr)
-	_ = writer.WriteField("contract.contract_id", ContractId)
-	_ = writer.WriteField("contract.variety_id", CarietyCode)
-	_ = writer.WriteField("currDate", currDate)
+	_ = writer.WriteField("year", strconv.Itoa(2024))
+	_ = writer.WriteField("month", "4")
+	_ = writer.WriteField("day", "10")
+	_ = writer.WriteField("contract.contract_id", "c2405")
+	_ = writer.WriteField("contract.variety_id", "c")
+	//_ = writer.WriteField("currDate", currDate)
 	err = writer.Close()
 	if err != nil {
-		utils.FileLog.Info("获取指标失败：" + currDate + VarietyName + ContractId)
+		utils.FileLog.Info("获取指标失败："  + VarietyName + ContractId)
 		return err
 	}
 	client := &http.Client{}
@@ -112,7 +112,7 @@ func SyncRankingFromDalianSearch(dayNum int) (err error) {
 	defer res.Body.Close()
 	body, err := ioutil.ReadAll(res.Body)
 	if err != nil {
-		msg := "失败提醒" + "RefreshDataFromDalian ErrMsg:" + err.Error() + "获取指标失败：" + currDate + VarietyName + ContractId
+		msg := "失败提醒" + "RefreshDataFromDalian ErrMsg:" + err.Error() + "获取指标失败："  + VarietyName + ContractId
 		go alarm_msg.SendAlarmMsg(msg, 3)
 		//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromDalian ErrMsg:"+err.Error()+"获取指标失败："+currDate+VarietyName+ContractId, utils.EmailSendToUsers)
 		return err
@@ -272,8 +272,11 @@ func DoHtml(body, name, contractId string, dateTime time.Time, listDataMap map[s
 			item := new(models.BaseFromTradeDalianIndex)
 			tds.Each(func(tk int, td *goquery.Selection) {
 				tdText := td.Text()
+				tdText = strings.Replace(tdText, "（代客）", "", -1)
 				if tk == 0 { //名次
-					rank = tdText
+					if tdText != " " {
+						rank = tdText
+					}
 				}
 				if tk == 1 { //会员简称
 					shortName = tdText
@@ -284,6 +287,11 @@ func DoHtml(body, name, contractId string, dateTime time.Time, listDataMap map[s
 				if tk == 3 { //增减
 					dealChange = strings.Replace(tdText, ",", "", -1)
 				}
+				if tk == 4 { //名次
+					if tdText != " " {
+						rank = tdText
+					}
+				}
 				if tk == 5 { //会员简称
 					buyName = tdText
 				}
@@ -294,6 +302,11 @@ func DoHtml(body, name, contractId string, dateTime time.Time, listDataMap map[s
 					buyChange = strings.Replace(tdText, ",", "", -1)
 				}
 
+				if tk == 8 { //名次
+					if tdText != " " {
+						rank = tdText
+					}
+				}
 				if tk == 9 { //会员简称
 					soldName = tdText
 				}

services/commodity_trade_zhengzhou.go

@@ -138,18 +138,21 @@ func SyncRankingFromZhengzhou() {
 
 					if tk == 1 {
 						if !strings.Contains(tdText, "会员简称") {
+							tdText = strings.Replace(tdText, "（代客）", "", -1)
 							memberShortNameArr = append(memberShortNameArr, tdText)
 						}
 					}
 
 					if tk == 4 {
 						if !strings.Contains(tdText, "会员简称") {
+							tdText = strings.Replace(tdText, "（代客）", "", -1)
 							memberShortNameArr = append(memberShortNameArr, tdText)
 						}
 					}
 
 					if tk == 7 {
 						if !strings.Contains(tdText, "会员简称") {
+							tdText = strings.Replace(tdText, "（代客）", "", -1)
 							memberShortNameArr = append(memberShortNameArr, tdText)
 						}
 					}